Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java

@@ -53,12 +53,12 @@ public interface ISysDictionaryService {
     SysDictionary getSysDictionaryById(Long id);
 
     /**
-     * 根据父级代码查询字典项信息
+     * 根据微服务与父级代码查询字典项
      * @param parentCode
      * @return
      */
-    @ApiOperation(value = "根据父级代码查询字典项信息")
+    @ApiOperation(value = "根据微服务与父级代码查询字典项")
-    List<SysDictionary> findSysDictionaryByParentCode(String parentCode);
+    List<SysDictionary> findSysDictionaryBySoftTypeAndParentCode(Integer softType,String parentCode);
 
     /**
      * 字典复杂查询，分页，排序

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.EncryptTool;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
@@ -13,6 +14,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
 import cn.estsh.i3plus.pojo.model.platform.UserDetailPagerModel;
+import cn.estsh.i3plus.pojo.model.platform.UserRolePagerModel;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -51,6 +53,9 @@ public class PersonnelController  extends CoreBaseController {
     @Autowired
     private ISysFileService fileService;
 
+    @Autowired
+    private ISysRoleService sysRoleService;
+
     @PostMapping(value="/user-detail/insert")
     @ApiOperation(value="添加用户信息",notes="返回内容添加用户信息")
     public ResultBean insertUserDetailModel(UserDetailModel model) {
@@ -463,6 +468,32 @@ public class PersonnelController  extends CoreBaseController {
         }
     }
 
+    @PostMapping(value = "/role/get-role-list")
+    @ApiOperation(value = "根据条件分页查询用户角色信息", notes = "根据条件分页查询用户角色信息")
+    public ResultBean queryPagerByRoleInfo(@RequestBody UserRolePagerModel model){
+        try {
+            ListPager<SysRole> listPager = sysRoleService.querySysRole(model.getSysRole(), model.getPager());
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(listPager);
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
+    @PostMapping(value = "/pager/get-user-list")
+    @ApiOperation(value = "根据条件分页查询用户信息", notes = "根据条件分页查询用户信息")
+    public ResultBean queryPagerByUserInfo(@RequestBody UserDetailPagerModel model){
+        try {
+            ListPager<SysUserInfo> listPager = personnelService.querySysUserInfo(model.getUserDetailModel(), model.getPager());
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(listPager);
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
     /**
      * 数据必填校验
      * @param model

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java

@@ -25,9 +25,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description : 字典管理服务
@@ -53,6 +55,7 @@ public class SysDictionaryController extends CoreBaseController{
             ValidatorBean.beginValid(sysDictionary)
                     .notNull("id",sysDictionary.getId())
                     .notNull("name",sysDictionary.getName())
+                    .notNull("softType",sysDictionary.getSoftType())
                     .notNull("dictionaryCode",sysDictionary.getDictionaryCode())
                     .notNull("dictionaryValue",sysDictionary.getDictionaryValue());
 
@@ -78,6 +81,7 @@ public class SysDictionaryController extends CoreBaseController{
             // 条件验证
             ValidatorBean.beginValid(sysDictionary)
                     .notNull("name",sysDictionary.getName())
+                    .notNull("softType",sysDictionary.getSoftType())
                     .notNull("dictionaryCode",sysDictionary.getDictionaryCode())
                     .notNull("dictionaryValue",sysDictionary.getDictionaryValue());
 
@@ -159,11 +163,11 @@ public class SysDictionaryController extends CoreBaseController{
         }
     }
 
-    @GetMapping(value = "/find/{code}")
+    @GetMapping(value = "/find/{softType}/{code}")
-    @ApiOperation(value = "根据父级code查询字典项", notes = "根据父级code查询字典项")
+    @ApiOperation(value = "根据微服务与父级code查询字典项", notes = "根据微服务与父级code查询字典项")
-    public ResultBean findSysDictionaryByParentCode(@PathVariable("code") String code) {
+    public ResultBean findSysDictionaryByParentCode(@PathVariable("softType")Integer softType,@PathVariable("code") String code) {
         try {
-            List<SysDictionary> sysDictionaryList = sysDictionaryService.findSysDictionaryByParentCode(code);
+            List<SysDictionary> sysDictionaryList = sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(softType,code);
             return ResultBean.success("操作成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
@@ -176,16 +180,25 @@ public class SysDictionaryController extends CoreBaseController{
     @ApiOperation(value = "查询跟用户相关所有字典")
     public ResultBean findSysDictionaryUserInfo() {
         try {
-            Map<String,Object> resultMap = new HashMap<>();
+            Map<String, Object> resultMap = new HashMap<>();
-            resultMap.put("1",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_SEX));
+            resultMap.put("1", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(
-            resultMap.put("2",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_FILE_TYPE));
+                    CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_SEX));
-            resultMap.put("3",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_MARRIAGE));
+            resultMap.put("2", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(
-            resultMap.put("4",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_EDUCATION));
+                    CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_FILE_TYPE));
-            resultMap.put("5",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_NATIONALITY));
+            resultMap.put("3", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(
-            resultMap.put("6",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_CERTIFICATE_TYPE));
+                    CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_MARRIAGE));
-            resultMap.put("7",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_EMPLOYEE_GRADE));
+            resultMap.put("4", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(
-            resultMap.put("8",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_POLITICAL_STATUS));
+                    CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_EDUCATION));
-            resultMap.put("9",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_EMPLOYEE_TYPE));
+            resultMap.put("5", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(
+                    CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_NATIONALITY));
+            resultMap.put("6", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(
+                    CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_CERTIFICATE_TYPE));
+            resultMap.put("7", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(
+                    CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_EMPLOYEE_GRADE));
+            resultMap.put("8", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(
+                    CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_POLITICAL_STATUS));
+            resultMap.put("9", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(
+                    CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_EMPLOYEE_TYPE));
 
             return ResultBean.success("操作成功").setResultMap(resultMap).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
@@ -256,4 +269,30 @@ public class SysDictionaryController extends CoreBaseController{
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+    @GetMapping("/tree")
+    @ApiOperation(value = "查询字典树",notes = "查询字典树")
+    public ResultBean findSysDictionaryTree(){
+        try {
+            // 根据软件类型分组
+            Map group = sysDictionaryService.findSysDictionaryByTop().stream().collect(Collectors.groupingBy(SysDictionary::getSoftType));
+
+            List<Map<String,Object>> dictTree = new ArrayList<>();
+            Map child;
+            for (CommonEnumUtil.SOFT_TYPE softType :CommonEnumUtil.SOFT_TYPE.values()) {
+                if(group.containsKey(softType.getValue())){
+                    child = new HashMap();
+                    child.put("id",softType.getCode());
+                    child.put("name",softType.getValue());
+                    child.put("childList",group.get(softType.getValue()));
+                    dictTree.add(child);
+                }
+            }
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(dictTree);
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java

@@ -172,14 +172,7 @@ public class SysLabelTemplateController extends CoreBaseController {
     @ApiOperation(value = "根据打印模板编号查询模板参数",notes = "根据打印模板编号查询模板参数")
     public ResultBean getSysLabelTemplateByTemplateId(@PathVariable("id") String id) {
         try {
-            if (StringUtils.isBlank(id)) {
+            ValidatorBean.checkNotNull(id, "打印模板编号不能为空");
-                throw ImppExceptionBuilder.newInstance()
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
-                        .setErrorDetail("打印模板编号为空")
-                        .setErrorSolution("请检查打印模板编号")
-                        .build();
-            }
 
             return  ResultBean.success("操作成功").setResultList(sysLabelTemplateService.listSysLabelTemplateParam(id))
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -194,14 +187,7 @@ public class SysLabelTemplateController extends CoreBaseController {
     @ApiOperation(value = "根据打印模板编号查询模板",notes = "根据打印模板编号查询模板")
     public ResultBean getSysLabelTemplateInfoById(@PathVariable("id") String id) {
         try {
-            if (StringUtils.isBlank(id)) {
+            ValidatorBean.checkNotNull(id, "打印模板编号不能为空");
-                throw ImppExceptionBuilder.newInstance()
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                        .setErrorDetail("打印模板编号为空")
-                        .setErrorSolution("请检查打印模板编号")
-                        .build();
-            }
 
             return  ResultBean.success("操作成功").setResultObject(sysLabelTemplateService.getLabelTemplateInfoById(id))
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java

@@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.i3plus.pojo.platform.repository.*;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
+import cn.estsh.i3plus.pojo.wms.sqlpack.WmsHqlPack;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@@ -197,7 +198,8 @@ public class PersonnelServiceService implements IPersonnelService {
 
     @Override
     public ListPager<SysUserInfo> querySysUserInfo(UserDetailModel model, Pager pager) {
-        return null;
+        pager = PagerHelper.getPager(pager, userInfoRDao.findByHqlWhereCount(CoreHqlPack.packHqlSysUserInfo(model.getSysUserInfo())));
+        return new ListPager<>(userInfoRDao.findByHqlWherePage(CoreHqlPack.packHqlSysUserInfo(model.getSysUserInfo()), pager), pager);
     }
 
     @Override

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java

@@ -40,9 +40,10 @@ public class SysDictionaryService implements ISysDictionaryService {
     @Override
     @ApiOperation(value = "添加字典")
     public void insertSysDictionary(SysDictionary sysDictionary) {
-        long repeatCodeCount = sysDictionaryRDao.findByPropertyCount("dictionaryCode",sysDictionary.getDictionaryCode());
+        long repeatCodeCount = sysDictionaryRDao.findByPropertyCount(new String[]{"dictionaryCode", "softType"},
-        long repeatValueCount = sysDictionaryRDao.findByPropertyCount(new String[]{"parentId","dictionaryValue"},
+                new Object[]{sysDictionary.getDictionaryCode(), sysDictionary.getSoftType()});
-                new Object[]{sysDictionary.getParentId(),sysDictionary.getDictionaryValue()});
+        long repeatValueCount = sysDictionaryRDao.findByPropertyCount(new String[]{"parentId", "dictionaryValue", "softType"},
+                new Object[]{sysDictionary.getParentId(), sysDictionary.getDictionaryValue(), sysDictionary.getSoftType()});
         if (repeatCodeCount > 0 || repeatValueCount > 0){
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
@@ -87,8 +88,8 @@ public class SysDictionaryService implements ISysDictionaryService {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
-                    .setErrorDetail("字典代码已存在")
+                    .setErrorDetail("字典代码或字典值已存在")
-                    .setErrorSolution("请重新输入字典代码")
+                    .setErrorSolution("请重新输入字典代码或字典值")
                     .build();
         }
 
@@ -132,9 +133,9 @@ public class SysDictionaryService implements ISysDictionaryService {
 
     @Override
     @ApiOperation(value = "根据父级代码查询字典项信息")
-    public List<SysDictionary> findSysDictionaryByParentCode(String parentCode) {
+    public List<SysDictionary> findSysDictionaryBySoftTypeAndParentCode(Integer softType,String parentCode) {
         LOGGER.info("字典 SYS_DICTIONARY parentCode:{}",parentCode);
-        return sysDictionaryRDao.findByProperty("parentCodeRdd",parentCode);
+        return sysDictionaryRDao.findByProperty(new String[]{"softType", "parentCodeRdd"}, new Object[]{softType, parentCode});
     }
 
     @Override
@@ -173,7 +174,8 @@ public class SysDictionaryService implements ISysDictionaryService {
     @Override
     @ApiOperation(value = "检出文件名称是否符合系统规范")
     public boolean checkFileName(String fileName) {
-        List<SysDictionary> list = findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_FILE_TYPE);
+        List<SysDictionary> list = findSysDictionaryBySoftTypeAndParentCode(CommonEnumUtil.SOFT_TYPE.CORE.getValue(),
+                                        BaseConstWords.DICTIONARY_FILE_TYPE);
 
         if(list != null && list.size()> 0){
             String suffix = StringTool.getStringFileSuffix(fileName,true);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java

@@ -36,9 +36,9 @@ public class BarcodeParseUtil {
         }
 
         //特殊分隔符处理
+        barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\\\","\\\\\\\\"));
         barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\|","\\\\|"));
         barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\.","\\\\."));
-        barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\\\","\\\\\\\\"));
 
         // 分隔条码信息
         String[] barcodeKey = barcodeRule.getBarcodeRule().split(barcodeRule.getBarcodeSeparator());

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java

@@ -3,7 +3,9 @@ package cn.estsh.i3plus.core.apiservice.util;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
-import com.alibaba.fastjson.JSON;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import org.apache.commons.lang3.StringUtils;
 
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
@@ -18,8 +20,16 @@ import java.text.SimpleDateFormat;
 public class OrderNoMakeUtil {
 
     public static SysOrderNoRule next(SysOrderNoRule orderNoRule) {
-        StringBuilder orderNo = new StringBuilder(orderNoRule.getOrderNoRule());
+        // 数据校验
+        if(orderNoRule == null || StringUtils.isBlank(orderNoRule.getOrderNoRule())){
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                    .setErrorDetail("单号生成规则不存在")
+                    .build();
+        }
 
+        StringBuilder orderNo = new StringBuilder(orderNoRule.getOrderNoRule());
         String[] dateTime = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(System.currentTimeMillis()).split("-");
         // 单号表达式
         replace(orderNo, PlatformConstWords.YEAR, dateTime[0]);

modules/i3plus-core-apiservice/src/main/resources/application-dev.properties

@@ -1,15 +1,15 @@
 #项目端口
 server.port=8100
 #本机ip
-impp.server.ip=192.168.1.20
+impp.server.ip=192.168.1.56
 #console控制台服务（zipkin追踪全路径）
-impp.console.ip=http://192.168.1.20:8010
+impp.console.ip=http://192.168.1.56:8010
 
 ################ 功能配置1 ################
 #若无法连接注册中心，是否需要一直检测加入
 impp.cluster.fetch=true
 #服务注册中心
-impp.cluster.regist.center=http://192.168.1.20:8000/eureka/
+impp.cluster.regist.center=http://192.168.1.56:8000/eureka/
 #多注册中心
 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/