修改部分pom

pom.xml

@@ -44,11 +44,11 @@
 	<profiles>
 		<profile>
 			<id>develop</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 			<properties>
 				<profiles.active>develop</profiles.active>
+				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+				<profiles.nacos.namespace>ai-gov</profiles.nacos.namespace>
+				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 			</properties>
 		</profile>
 		<profile>

workflow-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.base.login.web;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.service.IAuthTokenService;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.IUser;
@@ -26,6 +27,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Set;
 
+import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED;
+import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
+
 @RestController
 @Slf4j
 @RequestMapping("login")
@@ -73,7 +77,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
 
             String tmpToken = userEntity.getId() + ":" + IdUtil.fastSimpleUUID();
             userEntity.setToken(tmpToken);
-            userEntity.setExpireTime(DateUtils.addCurrDate(1).getTime());
+            userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
             String token = authTokenService.createToken(userEntity);
             data.put("token", token);
             // 返回拥有的菜单数据
@@ -118,7 +122,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         JSONObject ret = new JSONObject();
         IUser user = this.getCurUser();
         if (user == null) {
-           // return JSONObject.toJSONString(Rest.fail(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT));
+            return JSONObject.toJSONString(Rest.fail(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT));
         }
         Set<String> urls = resourceService.findUrlSetByUserId(user.getId());
         log.info("userId:{},urls:{}", user.getId(),JSON.toJSONString(urls));

workflow-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java

@@ -186,30 +186,6 @@ public class UserEntity extends UserVo implements IUser {
 		return userType;
 	}
 
-	@Override
-	public String getToken() {
-		return null;
-	}
-
-	@Override
-	public Long getLoginTime() {
-		return null;
-	}
-
-	@Override
-	public Long getExpireTime() {
-		return null;
-	}
-
-	@Override
-	public void setExpireTime(Long expireTime) {
-
-	}
-
-	@Override
-	public String getMenuUrl() {
-		return null;
-	}
 
 	public void setUserType(Integer userType) {
 		this.userType = userType;

workflow-manager/src/main/java/com/mortals/xhx/module/deploy/web/DeployFormController.java

 package com.mortals.xhx.module.deploy.web;
 
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.mortals.framework.web.BaseCRUDJsonMappingController;
@@ -17,7 +18,7 @@ import com.mortals.xhx.module.deploy.service.DeployFormService;
 */
 @RestController
 @RequestMapping("deploy/form")
-public class DeployFormController extends BaseCRUDJsonMappingController<DeployFormService,DeployFormForm,DeployFormEntity,Long> {
+public class DeployFormController extends BaseCRUDJsonBodyMappingController<DeployFormService,DeployFormEntity,Long> {
 
     public DeployFormController(){
         super.setFormClass(DeployFormForm.class);

workflow-manager/src/main/java/com/mortals/xhx/module/platform/web/PlatformController.java

@@ -8,6 +8,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.util.AESUtil;
 import com.mortals.framework.util.MD5Util;
 import com.mortals.framework.util.SecurityUtil;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.key.Constant;
@@ -45,7 +46,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("platform")
-public class PlatformController extends BaseCRUDJsonMappingController<PlatformService, PlatformForm, PlatformEntity, Long> {
+public class PlatformController extends BaseCRUDJsonBodyMappingController<PlatformService, PlatformEntity, Long> {
 
     @Autowired
     private ParamService paramService;
@@ -58,64 +59,61 @@ public class PlatformController extends BaseCRUDJsonMappingController<PlatformSe
     }
 
     @Override
-    protected void init(HttpServletRequest request, HttpServletResponse response, PlatformForm form, Map<String, Object> model, Context context) {
+    protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "status", IBaseEnum.getEnumMap(PlatformModelStatus.class));
-
         this.addDict(model, "type", IBaseEnum.getEnumMap(PlatformTypeEnum.class));
         this.addDict(model, "listenerType", paramService.getParamByFirstOrganize(Constant.Param_listener));
+    }
+
+    @Override
+    protected int doListAfter(PlatformEntity query, Map<String, Object> model, Context context) throws AppException {
 
+        model.put("result",model.get("data"));
 
-        super.init(request, response, form, model, context);
+        return super.doListAfter(query, model, context);
     }
 
+    @Override
+    protected void addAfter(Map<String, Object> model) throws AppException {
+        PlatformEntity entity = (PlatformEntity) model.get("entity");
+        //生成secuID
+        entity.setSecretKey(RandomUtil.randomString(64));
+        entity.setStatus(YesNoEnum.YES.getValue());
+
+        model.put("entity", entity);
+        super.addAfter(model);
+    }
 
     @Override
-    protected void saveBefore(HttpServletRequest request, HttpServletResponse response, PlatformForm form, Map<String, Object> model, Context context) throws AppException {
-        if (form.getEntity().newEntity()) {
+    protected void saveBefore(PlatformEntity entity, Map<String, Object> model, Context context) throws AppException {
+        if (entity.newEntity()) {
             //新增
-            PlatformEntity platformEntity = this.service.selectOne(new PlatformQuery().platformSn(form.getEntity().getPlatformSn()), context);
+            PlatformEntity platformEntity = this.service.selectOne(new PlatformQuery().platformSn(entity.getPlatformSn()), context);
 
             if (!ObjectUtils.isEmpty(platformEntity)) {
                 throw new AppException("业务平台标识已存在！");
             }
-        }else {
+        } else {
             //修改
-            PlatformEntity platformEntity = this.service.selectOne(new PlatformQuery().platformSn(form.getEntity().getPlatformSn()), context);
-            if (!ObjectUtils.isEmpty(platformEntity)&&form.getEntity().getId()!=platformEntity.getId()) {
+            PlatformEntity platformEntity = this.service.selectOne(new PlatformQuery().platformSn(entity.getPlatformSn()), context);
+            if (!ObjectUtils.isEmpty(platformEntity) && entity.getId() != platformEntity.getId()) {
                 throw new AppException("业务平台标识已存在！");
             }
         }
     }
 
     @Override
-    protected void addBefore(HttpServletRequest request, HttpServletResponse response, PlatformForm form, Map<String, Object> model) throws AppException {
-
-        super.addBefore(request, response, form, model);
-    }
-
-    @Override
-    protected void addAfter(HttpServletRequest request, HttpServletResponse response, PlatformForm form, Map<String, Object> model) throws AppException {
-        //生成secuID
-        form.getEntity().setSecretKey(RandomUtil.randomString(64));
-        form.getEntity().setStatus(YesNoEnum.YES.getValue());
-
-        model.put("entity", form.getEntity());
-        super.addAfter(request, response, form, model);
-    }
-
-
-    @Override
-    protected int saveAfter(HttpServletRequest request, HttpServletResponse response, PlatformForm form, Map<String, Object> model, Context context) throws AppException {
+    protected int saveAfter(PlatformEntity entity, Map<String, Object> model, Context context) throws AppException {
 
         Map<String, String> map = paramService.getParamByFirstOrganize(Constant.Param_listener);
 
-     if(form.getEntity().newEntity()){
+        if (entity.newEntity()) {
             Long id = (Long) model.get("id");
-         List<PlatformListenerEntity> collect = form.getEntity().getListener().stream().map(item -> {
+            List<PlatformListenerEntity> collect = entity.getListener().stream().map(item -> {
                 PlatformListenerEntity listenerEntity = new PlatformListenerEntity();
                 String value = map.get(item);
                 listenerEntity.setPlatformId(id);
-             listenerEntity.setPlatformSn(form.getEntity().getPlatformSn());
+                listenerEntity.setPlatformSn(entity.getPlatformSn());
                 listenerEntity.setTypeCode(item);
                 listenerEntity.setTypeName(value);
                 listenerEntity.setCreateTime(new Date());
@@ -124,15 +122,15 @@ public class PlatformController extends BaseCRUDJsonMappingController<PlatformSe
                 return listenerEntity;
             }).collect(Collectors.toList());
             listenerService.save(collect);
-     }else{
-         Long[] ids = listenerService.find(new PlatformListenerQuery().platformId(form.getEntity().getId())).stream().map(item -> item.getId()).toArray(Long[]::new);
-         listenerService.remove(ids,context);
+        } else {
+            Long[] ids = listenerService.find(new PlatformListenerQuery().platformId(entity.getId())).stream().map(item -> item.getId()).toArray(Long[]::new);
+            listenerService.remove(ids, context);
 
-         List<PlatformListenerEntity> collect = form.getEntity().getListener().stream().map(item -> {
+            List<PlatformListenerEntity> collect = entity.getListener().stream().map(item -> {
                 PlatformListenerEntity listenerEntity = new PlatformListenerEntity();
                 String value = map.get(item);
-             listenerEntity.setPlatformId(form.getEntity().getId());
-             listenerEntity.setPlatformSn(form.getEntity().getPlatformSn());
+                listenerEntity.setPlatformId(entity.getId());
+                listenerEntity.setPlatformSn(entity.getPlatformSn());
                 listenerEntity.setTypeCode(item);
                 listenerEntity.setTypeName(value);
                 listenerEntity.setCreateTime(new Date());
@@ -145,20 +143,13 @@ public class PlatformController extends BaseCRUDJsonMappingController<PlatformSe
 
         //新增
 
-
-
-
-       //
-        List<String> listener = form.getEntity().getListener();
+        List<String> listener = entity.getListener();
 
         //保存监听器
         //  List<PlatformListenerEntity> platformListenerEntities = listenerService.find(new PlatformListenerQuery().platformId(model.get("id").toString()));
 
 
-
-
-
-
-        return super.saveAfter(request, response, form, model, context);
+        return super.saveAfter(entity, model, context);
     }
+
 }
\ No newline at end of file

workflow-manager/src/main/java/com/mortals/xhx/module/platform/web/PlatformListenerController.java

 package com.mortals.xhx.module.platform.web;
 
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.mortals.framework.web.BaseCRUDJsonMappingController;
 import com.mortals.xhx.module.platform.model.PlatformListenerEntity;
 import com.mortals.xhx.module.platform.service.PlatformListenerService;
 
+import java.util.Map;
+
 
 /**
 * <p>Title: 平台用户流程监听关系表</p>
@@ -17,11 +22,16 @@ import com.mortals.xhx.module.platform.service.PlatformListenerService;
 */
 @RestController
 @RequestMapping("platform/listener")
-public class PlatformListenerController extends BaseCRUDJsonMappingController<PlatformListenerService,PlatformListenerForm,PlatformListenerEntity,Long> {
+public class PlatformListenerController extends BaseCRUDJsonBodyMappingController<PlatformListenerService,PlatformListenerEntity,Long> {
 
     public PlatformListenerController(){
         super.setFormClass(PlatformListenerForm.class);
         super.setModuleDesc("平台用户流程监听关系表");
     }
 
+    @Override
+    protected int doListAfter(PlatformListenerEntity query, Map<String, Object> model, Context context) throws AppException {
+        model.put("result",model.get("data"));
+        return super.doListAfter(query, model, context);
+    }
 }
\ No newline at end of file

workflow-manager/src/main/java/com/mortals/xhx/module/platform/web/PlatformModelinfoController.java

@@ -7,6 +7,7 @@ import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.common.code.PlatformStatus;
 import com.mortals.xhx.common.pdu.flow.FlowSaveXmlPdu;
 import com.mortals.xhx.module.platform.model.PlatformEntity;
@@ -40,17 +41,18 @@ import java.util.Map;
 */
 @RestController
 @RequestMapping("platform/modelinfo")
-public class PlatformModelinfoController extends BaseCRUDJsonMappingController<PlatformModelinfoService,PlatformModelinfoForm,PlatformModelinfoEntity,Long> {
+public class PlatformModelinfoController extends BaseCRUDJsonBodyMappingController<PlatformModelinfoService,PlatformModelinfoEntity,Long> {
 
     @Autowired
     private PlatformService platformService;
 
 
     @Override
-    protected void doListBefore(HttpServletRequest request, HttpServletResponse response, PlatformModelinfoForm form, Map<String, Object> model, Context context) throws AppException {
+    protected void doListBefore(PlatformModelinfoEntity query, Map<String, Object> model, Context context) throws AppException {
 
-        form.getQuery().setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
-        super.doListBefore(request, response, form, model, context);
+        query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
+
+        super.doListBefore(query, model, context);
     }
 
     public PlatformModelinfoController(){
@@ -59,12 +61,16 @@ public class PlatformModelinfoController extends BaseCRUDJsonMappingController<P
     }
 
     @Override
-    protected void init(HttpServletRequest request, HttpServletResponse response, PlatformModelinfoForm form, Map<String, Object> model, Context context) {
+    protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "status", IBaseEnum.getEnumMap(PlatformStatus.class));
-
-        super.init(request, response, form, model, context);
+        super.init(model, context);
     }
 
+    @Override
+    protected int doListAfter(PlatformModelinfoEntity query, Map<String, Object> model, Context context) throws AppException {
+        model.put("result",model.get("data"));
+        return super.doListAfter(query, model, context);
+    }
 
     /**
      * 流程部署XML

workflow-manager/src/main/java/com/mortals/xhx/module/task/service/TaskFinishService.java

@@ -17,7 +17,7 @@ import com.mortals.xhx.module.task.model.TaskFinishQuery;
 
 public interface TaskFinishService extends ICRUDService<TaskFinishEntity,Long>{
 
-    Result<FlowTaskPdu> finishList(TaskFinishQuery query, PageInfo pageInfo, Context context);
+    Result<FlowTaskPdu> finishList(TaskFinishEntity query, PageInfo pageInfo, Context context);
 
 
 }
\ No newline at end of file

workflow-manager/src/main/java/com/mortals/xhx/module/task/service/impl/TaskFinishServiceImpl.java

@@ -36,7 +36,7 @@ public class TaskFinishServiceImpl extends AbstractCRUDServiceImpl<TaskFinishDao
 
 
     @Override
-    public Result<FlowTaskPdu> finishList(TaskFinishQuery query, PageInfo pageInfo, Context context) {
+    public Result<FlowTaskPdu> finishList(TaskFinishEntity query, PageInfo pageInfo, Context context) {
         Result<FlowTaskPdu> result = new Result<>();
 
         try {

workflow-manager/src/main/java/com/mortals/xhx/module/task/web/TaskFinishController.java

 package com.mortals.xhx.module.task.web;
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BaseCRUDJsonMappingController;
 import com.mortals.xhx.module.task.model.TaskFinishEntity;
 import com.mortals.xhx.module.task.service.TaskFinishService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -24,40 +30,44 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("task/finish")
-public class TaskFinishController extends BaseCRUDJsonMappingController<TaskFinishService, TaskFinishForm, TaskFinishEntity, Long> {
+public class TaskFinishController extends BaseCRUDJsonBodyMappingController<TaskFinishService, TaskFinishEntity, Long> {
 
     public TaskFinishController() {
         super.setFormClass(TaskFinishForm.class);
         super.setModuleDesc("工作已办表");
     }
 
-    /**
-     * 查询已办列表
-     */
-    @PostMapping(value = "list")
     @Override
-    public String list(TaskFinishForm form) {
+    public Rest<Object> list(@RequestBody TaskFinishEntity query) {
+        Rest<Object> ret = new Rest();
         Map<String, Object> model = new HashMap();
-        JSONObject ret = new JSONObject();
-        int code = VALUE_RESULT_SUCCESS;
+        Context context = this.getContext();
         String busiDesc = "查询" + this.getModuleDesc();
+
+        int code;
         try {
-            Result result = this.service.finishList(form.getQuery(), form.getPageInfo(), getContext());
-            this.init(request, response, form, model, getContext());
-            model.put("result", result.getList());
+            this.doListBefore(query, model, context);
+            PageInfo pageInfo = this.buildPageInfo(query);
+
+            Result result = this.service.finishList(query,pageInfo, getContext());
+
+            model.put("data", result.getList());
             model.put("pageInfo", result.getPageInfo());
-            model.putAll(form.getModel());
-            this.recordSysLog(request, busiDesc + " 【成功】");
-        } catch (Exception e) {
-            log.error("查询已办列表异常", e);
-            this.doException(request, busiDesc, model, e);
-            code = VALUE_RESULT_FAILURE;
+            this.parsePageInfo(model, result.getPageInfo());
+            code = this.doListAfter(query, (Map)model, context);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = -1;
+            this.doException(this.request, busiDesc, model, var9);
         }
 
-        ret.put("code", code);
-        ret.put("query", form.getQuery());
-        ret.put("data", model);
-        return ret.toJSONString();
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
     }
 
 }
\ No newline at end of file