Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/AdminChangeConfigServiceImpl.java

@@ -19,7 +19,11 @@ import com.netease.mail.yanxuan.change.dal.mapper.ChangeConfigMapper;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigReq;
+import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeConfigArrayVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeConfigVO;
+import com.netease.mail.yanxuan.change.dal.meta.model.vo.PageVO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
@@ -57,11 +61,15 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
 
     @Override
     public AjaxResult queryChanges(Integer pageNum, Integer pageSize, ChangeConfigQueryReq req) {
+        ChangeConfigArrayVO vo = new ChangeConfigArrayVO();
         //进行分页
         PageHelper.startPage(pageNum,pageSize);
         List<ChangeConfigPo> changeConfigPos = mapper.selectChangeConfigPo(req);
         PageInfo<ChangeConfigPo> pageInfo = new PageInfo<>(changeConfigPos);
-        return AjaxResult.success(pageInfo);
+        PageVO pageVO = buildPageVo(changeConfigPos.size(), pageSize, pageNum);
+        vo.setChangeConfigs(pageInfo.getList());
+        vo.setPageVo(pageVO);
+        return AjaxResult.success(vo);
     }
 
     @Override
@@ -93,10 +101,11 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         getValue().set(CHANGE_CONFIG+id,changeConfigVO,1, TimeUnit.DAYS);
         return AjaxResult.success(JSONObject.parseObject(changeConfigVO, ChangeConfigVO.class));
     }
-
+    Logger logger = LoggerFactory.getLogger(AdminChangeConfigServiceImpl.class);
     @Override
     @Transactional
     public AjaxResult createChange(ChangeConfigReq changeConfigReq) {
+        logger.info("查看入参值"+changeConfigReq.toString());
         //添加一级二级类目
         List<ChangeType> changeTypes = typeService.addChangeType(changeConfigReq.getChangeTypes());
         ChangeConfig changeConfig = parameterSplicing(changeTypes,changeConfigReq);
@@ -225,4 +234,16 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         return JSONObject.toJSONString(vo);
     }
 
+    private PageVO buildPageVo(int totalCount, Integer pageSize, Integer page) {
+        int totalPage;
+        int i = totalCount % pageSize;
+        if (i != 0) {
+            totalPage = totalCount / pageSize + 1;
+        } else {
+            totalPage = totalCount / pageSize;
+        }
+        return PageVO.builder().page(page).totalPage(totalPage).pageSize(pageSize).pageCount(pageSize)
+                .totalCount(totalCount).build();
+    }
+
 }

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/ChangeTypeServiceImpl.java

@@ -6,6 +6,8 @@ import com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
 import com.netease.mail.yanxuan.change.dal.mapper.ChangeTypeMapper;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeTypePo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +31,7 @@ public class ChangeTypeServiceImpl implements ChangeTypeService {
         return mapper.queryTypes(id,sonChangeClassId,delete);
     }
 
+    Logger logger = LoggerFactory.getLogger(ChangeTypeServiceImpl.class);
 
     @Override
     @Transactional
@@ -36,6 +39,7 @@ public class ChangeTypeServiceImpl implements ChangeTypeService {
         if (changeTypes.size() != 2){
             throw ExceptionFactory.createBiz(ResponseCode.PARAMETER_LENGTH);
         }
+        logger.info("查看一级二级入参数量"+changeTypes.size() + "值\n" +changeTypes);
         //验证字符串长度
         if (changeTypes.get(0).getTypeName().length() > 20 && changeTypes.get(1).getTypeName().length() > 20){
             throw ExceptionFactory.createBiz(ResponseCode.PARAMETER_LENGTH);

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/ChangeConfigArrayVO.java

+package com.netease.mail.yanxuan.change.dal.meta.model.vo;
+
+import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/11/28/028$
+ */
+@Data
+public class ChangeConfigArrayVO {
+
+    /**
+     * 分页信息
+     */
+    private PageVO pageVo;
+
+    private List<ChangeConfigPo> changeConfigs;
+
+}

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeConfigController.java

@@ -38,24 +38,24 @@ public class ChangeConfigController {
      */
     @GetMapping("/list")
     public AjaxResult queryChanges(
-            @RequestParam(name = "pageNum",defaultValue = "1") Integer pageNum,
+            @RequestParam(name = "page",defaultValue = "1") Integer page,
             @RequestParam(name = "pageSize",defaultValue = "10")Integer pageSize,
             @RequestParam(name = "changeDepartment",required = false) String changeDepartment,
             @RequestParam(name = "changeExecDepartment",required = false) String changeExecDepartment,
             @RequestParam(name = "parentChangeClassId",required = false)Integer parentChangeClassId,
             @RequestParam(name = "sonChangeClassId",required = false)Integer sonChangeClassId,
             @RequestParam(name = "changeLevel",required = false)Integer changeLevel,
-            @RequestParam(name = "createTime",required = false)Long createTime,
-            @RequestParam(name = "updateTime",required = false)Long updateTime){
+            @RequestParam(name = "startTime",required = false)Long startTime,
+            @RequestParam(name = "endTime",required = false)Long endTime){
         ChangeConfigQueryReq req = new ChangeConfigQueryReq();
         req.setChangeDepartment(changeDepartment);
         req.setChangeExecDepartment(changeExecDepartment);
         req.setParentChangeClassId(parentChangeClassId);
         req.setSonChangeClassId(sonChangeClassId);
         req.setChangeLevel(changeLevel);
-        req.setCreateTime(createTime);
-        req.setUpdateTime(updateTime);
-        return service.queryChanges(pageNum,pageSize,req);
+        req.setCreateTime(startTime);
+        req.setUpdateTime(endTime);
+        return service.queryChanges(page,pageSize,req);
     }
 
     /**