微调

src/main/java/com/qs/serve/modules/base/controller/JslApiController.java

@@ -39,8 +39,8 @@ import javax.validation.Valid;
  */
 @Slf4j
 @AllArgsConstructor
-@RestController
+//@RestController
-@RequestMapping("/jsl")
+//@RequestMapping("/jsl")
 public class JslApiController {
 
     private SysUserService sysUserService;
@@ -69,9 +69,9 @@ public class JslApiController {
      * @param batchBo
      * @return
      */
-    @SysLog(title = "人员",desc = "用户新增",biz = BizType.INSERT)
+    //@SysLog(title = "人员",desc = "用户新增",biz = BizType.INSERT)
-    @PostMapping("/user/editBatch")
+    //@PostMapping("/user/editBatch")
-    @PreAuthorize("hasRole('sys:user:insert')")
+    //@PreAuthorize("hasRole('sys:user:insert')")
     @Transactional(rollbackFor = Exception.class)
     public R<?> saveBatch(@RequestBody @Valid SysUserBatchBo batchBo){
         for (SysUserBo userBo : batchBo.getUserList()) {
@@ -98,9 +98,9 @@ public class JslApiController {
             }else {
                 sysUserService.updateById(param);
             }
-            if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
+//            if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
-                sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());
+//                sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());
-            }
+//            }
         }
         return R.ok();
     }
@@ -111,9 +111,9 @@ public class JslApiController {
      * @param param
      * @return
      */
-    @PostMapping("/saveBatchTasteSpu")
+    //@PostMapping("/saveBatchTasteSpu")
-    @SysLog(module = SystemModule.GOODS, title = "spu", biz = BizType.INSERT)
+    //@SysLog(module = SystemModule.GOODS, title = "spu", biz = BizType.INSERT)
-    @PreAuthorize("hasRole('goods:spu:insert')")
+    //@PreAuthorize("hasRole('goods:spu:insert')")
     public R<?> saveBatchTasteSpu(@RequestBody GoodsSpuBatchTasteBo param){
         ValidateTools.valid(param.getTasteProducts());
         return R.ok(goodsSpuService.saveBatchTasteSpu(param));

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java

@@ -13,6 +13,7 @@ import com.qs.serve.modules.bms.entity.BmsMasterUser;
 import com.qs.serve.modules.bms.entity.BmsSupplierVisitType;
 import com.qs.serve.modules.bms.mapper.BmsMasterUserMapper;
 import com.qs.serve.modules.bms.service.BmsChannelPointService;
+import com.qs.serve.modules.bms.service.BmsSupplierChannelService;
 import com.qs.serve.modules.his.entity.HisUserChannelPoint;
 import com.qs.serve.modules.his.service.HisUserChannelPointService;
 import com.qs.serve.modules.tbs.entity.TbsActivityChannel;
@@ -45,6 +46,7 @@ public class BmsChannelController {
     private TbsActivityChannelService activityChannelService;
     private HisUserChannelPointService hisUserChannelPointService;
     private BmsMasterUserMapper bmsMasterUserMapper;
+    private BmsSupplierChannelService bmsSupplierChannelService;
 
     /**
      * 翻页
@@ -151,6 +153,9 @@ public class BmsChannelController {
         hisUserChannelPointService.removeByChannelId(id);
 
         boolean result = bmsChannelService.removeById(id);
+        if(result){
+            bmsSupplierChannelService.deleteByChannelId(id+"");
+        }
         return R.isTrue(result);
     }
 

src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java

@@ -227,8 +227,12 @@ public class BmsCostCenterController {
         if(activityCenterService.count(lqw)>0){
             return R.error("活动含当前成本中心，删除失败");
         }
-        boolean result = bmsCostCenterService.removeSelfAndChildById(id);
+        boolean result = bmsCostCenterService.listChild(id).size()>0;
-        return R.isTrue(result);
+        if(result){
+            return R.error("存在子节点无法删除");
+        }
+        bmsCostCenterService.removeById(id);
+        return R.ok();
     }
 
 }

src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java

@@ -85,7 +85,10 @@ public class BmsMasterUserController {
      */
     @GetMapping("/list4Point")
     public R<List<BmsMasterUser>> list4Point(BmsMasterUser param){
-        return R.error("已取消的接口");
+        LambdaQueryWrapper<BmsMasterUser> lqw = new LambdaQueryWrapper<>(param);
+        lqw.eq(BmsMasterUser::getType,MasterUserType.Point);
+        List<BmsMasterUser> list = bmsMasterUserService.list(lqw);
+        return R.ok(list);
     }
 
     /**

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierChannelController.java

@@ -8,6 +8,7 @@ import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsChannel;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierChannelBo;
@@ -41,6 +42,22 @@ public class BmsSupplierChannelController {
     private BmsChannelService bmsChannelService;
     private BmsSupplierService bmsSupplierService;
 
+
+    /**
+     * 翻页
+     * @param param
+     * @return
+     */
+    @GetMapping("/list")
+    @PreAuthorize("hasRole('bms:supplierChannel:query')")
+    public R<List<BmsSupplierChannel>> getList(BmsSupplierChannel param){
+        if(param.getSupplierId()==null&&param.getChannelId()==null){
+            return R.ok();
+        }
+        List<BmsSupplierChannel> list = bmsSupplierChannelService.selectSupplierChannelList(param);
+        return R.ok(list);
+    }
+
     /**
      * 翻页
      * @param param

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -11,9 +11,7 @@ import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.*;
-import com.qs.serve.modules.bms.entity.BmsRegion;
+import com.qs.serve.modules.bms.entity.*;
-import com.qs.serve.modules.bms.entity.BmsRegion2;
-import com.qs.serve.modules.bms.entity.BmsSupplierVisitAddress;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierBo;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierParentBo;
 import com.qs.serve.modules.bms.entity.vo.BmsSupplierTreeVo;
@@ -32,8 +30,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import com.qs.serve.modules.bms.entity.BmsSupplier;
-
 import javax.validation.Valid;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -52,6 +48,8 @@ public class BmsSupplierController {
     private BmsSupplierService bmsSupplierService;
     private BmsSupplierAddressService bmsSupplierAddressService;
     private BmsSupplierVisitAddressService bmsSupplierVisitAddressService;
+    private BmsSupplierContactsService bmsSupplierContactsService;
+    private BmsSupplierChannelService bmsSupplierChannelService;
     private BmsRegionService bmsRegionService;
     private BmsRegion2Service bmsRegion2Service;
     private SysUserService sysUserService;
@@ -499,6 +497,8 @@ public class BmsSupplierController {
         //删除客户地址
         bmsSupplierAddressService.removeBySupplierId(id);
         bmsSupplierVisitAddressService.removeBySupplierId(id);
+        bmsSupplierContactsService.deleteBySupplierId(id);
+        bmsSupplierChannelService.deleteBySupplierId(id);
         return R.ok();
     }
 

src/main/java/com/qs/serve/modules/bms/service/BmsCostCenterService.java

@@ -3,6 +3,8 @@ package com.qs.serve.modules.bms.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.serve.modules.bms.entity.BmsCostCenter;
 
+import java.util.List;
+
 /**
  * 成本中心 服务接口
  * @author YenHex
@@ -12,7 +14,6 @@ public interface BmsCostCenterService extends IService<BmsCostCenter> {
 
     BmsCostCenter getByCode(String code);
     BmsCostCenter getByName(String name);
-
+    List<BmsCostCenter> listChild(Long pid);
-    boolean removeSelfAndChildById(Long id);
 }
 

src/main/java/com/qs/serve/modules/bms/service/BmsSupplierChannelService.java

@@ -15,5 +15,8 @@ public interface BmsSupplierChannelService extends IService<BmsSupplierChannel>
 
     List<BmsSupplierChannel> selectSupplierChannelList(BmsSupplierChannel supplierChannel);
 
+    void deleteBySupplierId(String id);
+    void deleteByChannelId(String id);
+
 }
 

src/main/java/com/qs/serve/modules/bms/service/BmsSupplierContactsService.java

@@ -10,5 +10,7 @@ import com.qs.serve.modules.bms.entity.BmsSupplierContacts;
  */
 public interface BmsSupplierContactsService extends IService<BmsSupplierContacts> {
 
+    void deleteBySupplierId(String id);
+
 }
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsCostCenterServiceImpl.java

@@ -35,24 +35,12 @@ public class BmsCostCenterServiceImpl extends ServiceImpl<BmsCostCenterMapper,Bm
         lqw.eq(BmsCostCenter::getName,name);
         return this.getOne(lqw,true);
     }
-
+    @Override
-    private List<BmsCostCenter> listChild(Long pid) {
+    public List<BmsCostCenter> listChild(Long pid) {
         LambdaQueryWrapper<BmsCostCenter> lqw = new LambdaQueryWrapper<>();
         lqw.eq(BmsCostCenter::getPid,pid);
         return this.list(lqw);
     }
 
-    @Override
-    public boolean removeSelfAndChildById(Long id) {
-        List<BmsCostCenter> list = listChild(id);
-        for(BmsCostCenter subject:list){
-            boolean result =  removeSelfAndChildById(subject.getId());
-            if(!result){
-                return false;
-            }
-        }
-        return this.removeById(id);
-    }
-
 }
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierChannelServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.bms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,5 +25,21 @@ public class BmsSupplierChannelServiceImpl extends ServiceImpl<BmsSupplierChanne
     public List<BmsSupplierChannel> selectSupplierChannelList(BmsSupplierChannel supplierChannel) {
         return baseMapper.selectSupplierChannelList(supplierChannel);
     }
+
+
+    @Override
+    public void deleteByChannelId(String id) {
+        LambdaQueryWrapper<BmsSupplierChannel> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(BmsSupplierChannel::getChannelId,id);
+        this.remove(lqw);
+    }
+
+    @Override
+    public void deleteBySupplierId(String id) {
+        LambdaQueryWrapper<BmsSupplierChannel> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(BmsSupplierChannel::getSupplierId,id);
+        this.remove(lqw);
+    }
+
 }
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierContactsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.bms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -18,5 +19,12 @@ import com.qs.serve.modules.bms.mapper.BmsSupplierContactsMapper;
 @AllArgsConstructor
 public class BmsSupplierContactsServiceImpl extends ServiceImpl<BmsSupplierContactsMapper,BmsSupplierContacts> implements BmsSupplierContactsService {
 
+    @Override
+    public void deleteBySupplierId(String id) {
+        LambdaQueryWrapper<BmsSupplierContacts> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(BmsSupplierContacts::getSupplierId,id);
+        this.remove(lqw);
+    }
+
 }
 

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -225,10 +225,18 @@ public class SysUserController {
     @Transactional(rollbackFor = Exception.class)
     public R<?> save(@RequestBody @Valid SysUserBo userBo){
         SysUser param = CopierUtil.copy(userBo,new SysUser());
+        param.setAccount(userBo.getCode());
         //设置普通管理员
         param.setSuperFlag(0);
         param.setTenantId(AuthContextUtils.getTenant());
         //检查手机号是否已用
+        LambdaQueryWrapper<SysUser> wrapperCode = new LambdaQueryWrapper<>();
+        wrapperCode.eq(SysUser::getCode,param.getCode());
+        Long countCode = sysUserService.count(wrapperCode);
+        if(countCode>0L){
+            return R.error("工号已被注册");
+        }
+        //检查手机号是否已用
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SysUser::getMobile,param.getMobile());
         Long count = sysUserService.count(wrapper);
@@ -247,9 +255,9 @@ public class SysUserController {
             param.setSyAccount("");
         }
         boolean result = sysUserService.save(param);
-        if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
+//        if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
-            sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());
+//            sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());
-        }
+//        }
         return R.isTrue(result);
     }
 
@@ -262,8 +270,9 @@ public class SysUserController {
     @PostMapping("/updateById")
     @PreAuthorize("hasRole('sys:user:update')")
     @Transactional(rollbackFor = Exception.class)
-    public R<?> updateById(@RequestBody @Valid SysUserBo userBo){
+    public R<?> updateById(@RequestBody SysUserBo userBo){
         SysUser param = CopierUtil.copy(userBo,new SysUser());
+        param.setCode(null);
         if(param.getMobile()!=null){
             param.setAccount(param.getMobile());
         }

src/main/java/com/qs/serve/modules/sys/entity/bo/SysUserBo.java

@@ -25,20 +25,21 @@ public class SysUserBo {
     private String mobile;
 
     /** 账号 */
-    @Length(max = 64,message = "账号长度不能超过20字")
+    //@Length(max = 64,message = "账号长度不能超过20字")
-    private String account;
+    //private String account;
 
     /** 昵称 */
     @Length(max = 64,message = "昵称长度不能超过20字")
     private String name;
 
     /** 编号/工号 */
-    @Length(max = 64,message = "编号/工号长度不能超过64字")
+    @NotNull
+    @Length(max = 64,message = "编号/工号长度")
     private String code;
 
     /** 头像 */
-    @Length(max = 255,message = "头像长度不能超过255字")
+    //@Length(max = 255,message = "头像长度不能超过255字")
-    private String icon;
+    //private String icon;
 
     /** 部门ID */
     @Length(max = 64,message = "部门ID长度不能超过64字")
@@ -57,8 +58,8 @@ public class SysUserBo {
     private String remark;
 
     /** 角色ID列表 */
-    @TableField(exist = false)
+    //@TableField(exist = false)
-    private List<String> roleIds;
+    //private List<String> roleIds;
 
     /** 致远登陆账户 */
     @NotNull

src/main/resources/mapper/bms/BmsMasterUserMapper.xml

@@ -10,9 +10,6 @@
         <result property="targetId"  column="target_id"/>
         <result property="userId"  column="user_id"/>
         <result property="masterFlag"  column="master_flag"/>
-        <result property="sp1"  column="sp1"/>
-        <result property="sp2"  column="sp2"/>
-        <result property="sp3"  column="sp3"/>
         <result property="remark"  column="remark"/>
         <result property="createTime"  column="create_time"/>
         <result property="createBy"  column="create_by"/>
@@ -51,9 +48,6 @@
         bms_master_user.`target_id`,
         bms_master_user.`user_id`,
         bms_master_user.`master_flag`,
-        bms_master_user.`sp1`,
-        bms_master_user.`sp2`,
-        bms_master_user.`sp3`,
         bms_master_user.`remark`,
         bms_master_user.`create_time`,
         bms_master_user.`create_by`,
@@ -68,9 +62,9 @@
         <if test="query.targetId != null and query.targetId != ''"> and `bms_master_user`.`target_id` = #{query.targetId}</if>
         <if test="query.userId != null and query.userId != ''"> and `bms_master_user`.`user_id` = #{query.userId}</if>
         <if test="query.masterFlag != null"> and `bms_master_user`.`master_flag` = #{query.masterFlag}</if>
-        <if test="query.sp1 != null and query.sp1 != ''"> and `bms_master_user`.`sp1` = #{query.sp1}</if>
+<!--        <if test="query.sp1 != null and query.sp1 != ''"> and `bms_master_user`.`sp1` = #{query.sp1}</if>-->
-        <if test="query.sp2 != null and query.sp2 != ''"> and `bms_master_user`.`sp2` = #{query.sp2}</if>
+<!--        <if test="query.sp2 != null and query.sp2 != ''"> and `bms_master_user`.`sp2` = #{query.sp2}</if>-->
-        <if test="query.sp3 != null and query.sp3 != ''"> and `bms_master_user`.`sp3` = #{query.sp3}</if>
+<!--        <if test="query.sp3 != null and query.sp3 != ''"> and `bms_master_user`.`sp3` = #{query.sp3}</if>-->
         <if test="query.remark != null and query.remark != ''"> and `bms_master_user`.`remark` = #{query.remark}</if>
         <if test="query.createTime != null"> and `bms_master_user`.`create_time` = #{query.createTime}</if>
         <if test="query.createBy != null and query.createBy != ''"> and `bms_master_user`.`create_by` = #{query.createBy}</if>