修改基础信息

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/OrgUpdateReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrgReq.java

 package com.junmp.jyzb.api.bean.req;
 
-import com.junmp.v2.common.bean.request.BaseRequest;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
-public class OrgUpdateReq extends BaseRequest {
+public class UpdateOrgReq {
 
     /**
      * 状态
      */
-    @NotBlank(message = "状态不能为空", groups = {ValidationApi.edit.class})
-    private String statusFlag;
+    @NotBlank(message = "状态不能为空", groups = {ValidationApi.updateStatus.class})
+    private Integer statusFlag;
     /**
      * 组织机构列表
      */
-    private List<orgIdList> orgIdList;
+    private List<String> orgIdList;
+
 
-    private class orgIdList {
-        /**
-         * 状态
-         */
-        @NotBlank(message = "组织机构id不能为空", groups = {ValidationApi.edit.class})
-        private int id;
-    }
 }
 
 

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/OrgExceptionEnum.java

+package com.junmp.jyzb.api.exception.enums;
+
+import com.junmp.jyzb.api.constant.JYZBConstant;
+import com.junmp.v2.common.constant.CommonConstant;
+import com.junmp.v2.common.exception.IExceptionEnum;
+import lombok.Getter;
+
+@Getter
+public enum OrgExceptionEnum  implements IExceptionEnum {
+
+    /**
+     * 装备不存在
+     */
+    ORG_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 13, "{}");
+
+
+    /**
+     * 错误编码
+     */
+    private final Integer code;
+
+    /**
+     * 提示用户信息
+     */
+    private final String message;
+
+
+    OrgExceptionEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+}

jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentSizeController.java

@@ -29,7 +29,7 @@ public class EquipmentSizeController {
 
     @PostMapping("/AddSize")
     @ApiOperation("添加号型信息")
-    public ApiRes<Boolean> addSize(@RequestBody @Validated(ValidationApi.add.class) UpdateEquipmentSizeReq req) {
+    public ApiRes<String> addSize(@RequestBody @Validated(ValidationApi.add.class) UpdateEquipmentSizeReq req) {
         return ApiRes.success(equipmentSizeService.addSize(req));
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java

@@ -28,7 +28,7 @@ public class EquipmentTypeController {
 
     @PostMapping("/AddEquipment")
     @ApiOperation("添加物资")
-    public ApiRes<Boolean> addEquipment(@RequestBody @Validated(ValidationApi.add.class) UpdateEquipmentTypeReq req) {
+    public ApiRes<String> addEquipment(@RequestBody @Validated(ValidationApi.add.class) UpdateEquipmentTypeReq req) {
         return ApiRes.success(equipmentTypeService.addEquipment(req));
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PubOrgController.java

@@ -2,14 +2,18 @@ package com.junmp.jyzb.controller;
 
 import com.junmp.jyzb.api.bean.dto.OrgDto;
 import com.junmp.jyzb.api.bean.dto.OrgTreeDto;
+import com.junmp.jyzb.api.bean.query.ProductSkuReq;
 import com.junmp.jyzb.api.bean.query.QueryOrgReq;
+import com.junmp.jyzb.api.bean.req.UpdateOrgReq;
 import com.junmp.jyzb.service.PubOrgService;
 import com.junmp.jyzb.utils.ResponseResult;
+import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.lang.Nullable;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -44,6 +48,11 @@ public class PubOrgController {
     public ApiRes<List<OrgTreeDto>> getOrgList(@RequestBody QueryOrgReq req) {
         return ApiRes.success(pubOrgService.getOrgList(req));
     }
+    @PostMapping("/ChangeOrgState")
+    @ApiOperation("改变组织机构状态信息")
+    public ApiRes<Boolean> changeOrgState(@RequestBody @Validated(ValidationApi.edit.class) UpdateOrgReq req) {
+        return ApiRes.success(pubOrgService.ChangeState(req));
+    }
     @PostMapping("/GetLowOrg")
     @ApiOperation("根据组织机构查询下一级信息")
     public ApiRes<List<OrgDto>> getLowOrg(@RequestBody QueryOrgReq req) {

jyzb-biz/src/main/java/com/junmp/jyzb/controller/SupplierController.java

@@ -29,7 +29,7 @@ public class SupplierController {
 
     @PostMapping("/AddSupplier")
     @ApiOperation("添加供应商")
-    public ApiRes<Boolean> AddSupplier(@RequestBody @Validated(ValidationApi.add.class) UpdateSupplierReq req) {
+    public ApiRes<String> AddSupplier(@RequestBody @Validated(ValidationApi.add.class) UpdateSupplierReq req) {
         return ApiRes.success(supplierService.AddSupplier(req));
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/controller/UserController.java

 package com.junmp.jyzb.controller;
 
-import com.junmp.jyzb.service.MsgService;
+
 import com.junmp.jyzb.utils.ResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,22 +16,7 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("/User")
-@Api(tags = "根据表明和组织机构id获取相关信息")
+@Api(tags = "用户表")
 public class UserController {
-    @Resource
-    public MsgService msgService;
-
-    @PostMapping("/GetMsg")
-    @ApiOperation("获取相关信息")
-    public ResponseResult getMsg(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = msgService.getMsg(msg);
-        return returnMsg;
-    }
 
-    @PostMapping("/GetUserMsg")
-    @ApiOperation("根据组织机构获取用户信息")
-    public ResponseResult getUserMsg(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = msgService.getUserMsg(msg);
-        return returnMsg;
-    }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentSizeService.java

@@ -10,7 +10,7 @@ import com.junmp.jyzb.utils.ResponseResult;
 import java.util.List;
 
 public interface EquipmentSizeService extends IService<EquipmentSize> {
-    Boolean addSize(UpdateEquipmentSizeReq req);
+    String addSize(UpdateEquipmentSizeReq req);
 
     EquipmentSize getOneSize(QueryEquipmentSizeReq req);
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentTypeService.java

@@ -13,7 +13,7 @@ import java.util.Map;
 
 public interface EquipmentTypeService extends IService<EquipmentType> {
 
-    Boolean addEquipment(UpdateEquipmentTypeReq req );
+    String addEquipment(UpdateEquipmentTypeReq req );
 
 
     Boolean deleteEquipment(UpdateEquipmentTypeReq req);

jyzb-biz/src/main/java/com/junmp/jyzb/service/MsgService.java

-package com.junmp.jyzb.service;
-
-import com.junmp.jyzb.utils.ResponseResult;
-
-import java.util.Map;
-
-public interface MsgService {
-
-    ResponseResult getMsg(Map<String, Object> msg);
-
-    ResponseResult getUserMsg(Map<String, Object> msg);
-}

jyzb-biz/src/main/java/com/junmp/jyzb/service/PubOrgService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.dto.OrgDto;
 import com.junmp.jyzb.api.bean.dto.OrgTreeDto;
 import com.junmp.jyzb.api.bean.query.QueryOrgReq;
+import com.junmp.jyzb.api.bean.req.UpdateOrgReq;
 import com.junmp.jyzb.utils.ResponseResult;
 
 import java.util.List;
@@ -22,4 +23,6 @@ public interface PubOrgService extends IService<PubOrg> {
     List<OrgTreeDto> getOrgList(QueryOrgReq req);
     List<OrgDto> getLowOrg(QueryOrgReq req);
 
+    Boolean ChangeState(UpdateOrgReq req);
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/SupplierService.java

@@ -14,7 +14,7 @@ public interface SupplierService extends IService<Supplier> {
      *
      * @param req
      */
-    boolean AddSupplier(UpdateSupplierReq req);
+    String AddSupplier(UpdateSupplierReq req);
 
     /**
     * @Author: Zhaojw

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentSizeServiceImpl.java

@@ -33,10 +33,13 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
 
 
     @Override
-    public Boolean addSize(UpdateEquipmentSizeReq req) {
+    public String addSize(UpdateEquipmentSizeReq req) {
         EquipmentSize size = new EquipmentSize();
+        String sizeID=UUID.randomUUID().toString();
         BeanPlusUtil.copyProperties(req, size);
-        return this.save(size);
+        size.setId(sizeID);
+        this.save(size);
+        return sizeID;
     }
 
     @Override

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java

@@ -126,7 +126,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
 
     @Transactional
     @Override
-    public Boolean addEquipment(UpdateEquipmentTypeReq req) {
+    public String addEquipment(UpdateEquipmentTypeReq req) {
 
         EquipmentType type = new EquipmentType();
 
@@ -153,7 +153,8 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
             );
             supplierTypeService.saveBatch(supplierType);
             this.updateById(parentType);
-            return this.save(type);
+            this.save(type);
+            return  String.valueOf(newcode);
         } else {
             String msg="以下供应商不存在：" +String.join(",", chekResult);
             throw new JYZBAppException(EquipmentTypeExceptionEnum.SUPPLIER_NOT_EXIST, msg);

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/MsgServiceImpl.java

-package com.junmp.jyzb.service.impl;
-
-import com.junmp.jyzb.mapper.MsgMapper;
-import com.junmp.jyzb.service.MsgService;
-import com.junmp.jyzb.utils.HttpStatus;
-import com.junmp.jyzb.utils.ResponseResult;
-import com.junmp.jyzb.utils.ReturnMsg;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
-
-@Service
-public class MsgServiceImpl implements MsgService {
-    @Resource
-    private MsgMapper msgMapper;
-
-    @Override
-    public ResponseResult getMsg(Map<String, Object> msg) {
-        try {
-            checkNotBlank(msg.get("orgId"), "orgId不能为空");
-            checkNotBlank(msg.get("tableName"), "tableName不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
-        }
-
-        String orgId = msg.get("orgId").toString();
-        String tableName = msg.get("tableName").toString();
-
-        List<Map<String,Object>> returnMsg =  msgMapper.getMsg(orgId,tableName);
-        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
-    }
-
-    @Override
-    public ResponseResult getUserMsg(Map<String, Object> msg) {
-        try {
-            checkNotBlank(msg.get("orgId"), "orgId不能为空");
-        } catch (IllegalArgumentException e) {
-            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
-        }
-
-        String orgId = msg.get("orgId").toString();
-
-        List<Map<String,Object>> returnMsg =  msgMapper.getUserMsg(orgId);
-        return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
-    }
-}

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java

 package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
 import com.junmp.jyzb.api.bean.dto.OrgDto;
 import com.junmp.jyzb.api.bean.dto.OrgTreeDto;
-import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
 import com.junmp.jyzb.api.bean.query.QueryOrgReq;
-import com.junmp.jyzb.api.bean.req.OrgUpdateReq;
-import com.junmp.jyzb.api.bean.query.ProductTagReq;
-import com.junmp.jyzb.entity.EquipmentType;
-import com.junmp.jyzb.entity.ProductTag;
+import com.junmp.jyzb.api.bean.req.UpdateOrgReq;
+import com.junmp.jyzb.api.exception.JYZBAppException;
+import com.junmp.jyzb.api.exception.enums.EquipmentTypeExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.OrgExceptionEnum;
 import com.junmp.jyzb.entity.PubOrg;
 import com.junmp.jyzb.entity.Supplier;
 import com.junmp.jyzb.utils.HttpStatus;
@@ -25,15 +18,11 @@ import com.junmp.jyzb.utils.ResponseResult;
 import com.junmp.jyzb.utils.ReturnMsg;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.DataType;
-import org.springframework.data.redis.core.ListOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.PubOrgMapper;
 import com.junmp.jyzb.service.PubOrgService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -231,7 +220,50 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
         return childList;
     }
 
+    @Transactional
+    public Boolean ChangeState(UpdateOrgReq req)
+    {
+        List<String> chekResult = CheckOrgList(req.getOrgIdList());
+        if (chekResult.size() == 0){
+            LambdaQueryWrapper<PubOrg> wp = new LambdaQueryWrapper<>();
+            wp.in(ObjectUtil.isNotEmpty(req.getOrgIdList()), PubOrg::getOrgId, req.getOrgIdList());
+            List<PubOrg> st = list(wp);
+            st.forEach(p->
+            {
+                p.setStatusFlag(req.getStatusFlag());
 
+            });
+           return   this.updateBatchById(st);
+        }
+        else
+        {
+            String msg="以下组织机构不存在：" +String.join(",", chekResult);
+            throw new JYZBAppException(OrgExceptionEnum.ORG_NOT_EXIST, msg);
+        }
+    }
+
+    public List<String>  CheckOrgList(List<String> req){
+        LambdaQueryWrapper<PubOrg> wp = new LambdaQueryWrapper<>();
+        wp.in(ObjectUtil.isNotEmpty(req), PubOrg::getOrgId, req);
+        List<PubOrg> st = list(wp);
+
+        List<String> nonexistentOrgs = new ArrayList<>();
+        for (String pubOrgs : req) {
+            boolean found = false;
+            for (PubOrg pubOrg : st) {
+                if (pubOrg.getOrgId().toString().equals( pubOrgs)) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                nonexistentOrgs.add(pubOrgs);
+            }
+        }
+
+        return nonexistentOrgs;
+
+    }
     public List<OrgDto> getLowOrg(QueryOrgReq req){
         if (ObjectUtil.isEmpty(req.getParentId())) {
             req.setParentId(req.getOrgId());

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java

@@ -25,11 +25,13 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
 
     @Override
-    public boolean AddSupplier(UpdateSupplierReq req) {
+    public String AddSupplier(UpdateSupplierReq req) {
         Supplier supplier = new Supplier();
-        req.setId(UUID.randomUUID().toString());
+        String ID=UUID.randomUUID().toString();
+        req.setId(ID);
         BeanPlusUtil.copyProperties(req, supplier);
-        return this.save(supplier);
+        this.save(supplier);
+        return ID;
     }
 
 

jyzb-biz/src/main/resources/mapper/MsgMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.junmp.jyzb.mapper.MsgMapper">
-<select id="getMsg" resultType="Map">
-  <if test="tableName != null and tableName != ''">
-    <![CDATA[
-    select *
-    from ]]>
-    ${tableName}
-    <![CDATA[
-    where org_id = #{orgId}
-    ]]>
-  </if>
-</select>
-
-<select id="getUserMsg" resultType="Map">
-    select
-    suo.user_org_id as userOrgId,
-    suo.user_id as userId,
-    suo.org_id as orgId,
-    suo.position_id as positionId,
-    su.real_name as realName,
-    su.nick_name as nickName,
-    su.account as account,
-    su.password as password,
-    su.avatar as avatar,
-    su.birthday as birthday,
-    su.sex as sex,
-    su.email as email,
-    su.phone as phone,
-    su.tel as tel,
-    su.super_admin_flag as superAdminFlag,
-    su.status_flag as statusFlag,
-    su.user_type as userType,
-    su.last_login_ip as lastLoginIp,
-    su.last_login_time as lastLoginTime,
-    su.del_flag as delFlag,
-    su.create_time as createTime,
-    su.create_user as createUser,
-    su.update_time as updateTime,
-    su.update_user as updateUser,
-    su.app_flag as appFlag
-    from sys_user_org suo
-    join sys_user su on suo.user_id = su.user_id
-    where suo.org_id = #{orgId}
-</select>
-</mapper>
\ No newline at end of file