添加区域树

setup-project-manager/src/main/java/com/mortals/xhx/base/system/param/dao/ibatis/ParamDaoImpl.java

@@ -11,7 +11,6 @@ package com.mortals.xhx.base.system.param.dao.ibatis;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.base.system.param.dao.ParamDao;
 import com.mortals.xhx.base.system.param.model.ParamEntity;
-
 import org.springframework.stereotype.Repository;
 
 /**

setup-project-manager/src/main/java/com/mortals/xhx/base/system/param/model/ParamQuery.java

@@ -8,6 +8,7 @@
 
 package com.mortals.xhx.base.system.param.model;
 import java.util.List;
+
 /**
  * <p>Title: 参数信息</p>
  * <p>Description: ParamQuery  </p>
@@ -17,7 +18,7 @@ import java.util.List;
  * @version 1.0.0
  */
 public class ParamQuery extends ParamEntity{
-	private static final long serialVersionUID = 1547777703337L;
+	private static final long serialVersionUID = 1536307966364L;
 	/** 开始 序号，主键，自增长 */
 	private Long idStart;
 
@@ -69,16 +70,16 @@ public class ParamQuery extends ParamEntity{
 	/** 参数修改状态，0：隐藏，1：页面仅查看，2：页面可修改，3：页面可删除，4：页面可修改删除，默认4 */
 	private List<Integer> modStatusList;
 
-	/** 开始 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0 */
+	/** 开始 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0 */
 	private Integer displayTypeStart;
 
-	/** 结束 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0 */
+	/** 结束 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0 */
 	private Integer displayTypeEnd;
 
-	/** 增加 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0 */
+	/** 增加 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0 */
 	private Integer displayTypeIncrement;
 
-	/** 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0 */
+	/** 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0 */
 	private List<Integer> displayTypeList;
 
 	/** 备注 */
@@ -90,16 +91,16 @@ public class ParamQuery extends ParamEntity{
 	/** 结束 创建时间 */
 	private String createTimeEnd;
 
-	/** 开始 创建用户 */
+	/** 开始 创建用户ID */
 	private Long createUserIdStart;
 
-	/** 结束 创建用户 */
+	/** 结束 创建用户ID */
 	private Long createUserIdEnd;
 
-	/** 增加 创建用户 */
+	/** 增加 创建用户ID */
 	private Long createUserIdIncrement;
 
-	/** 创建用户 */
+	/** 创建用户ID */
 	private List<Long> createUserIdList;
 
 	/** 创建用户名称 */
@@ -381,7 +382,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 获取 开始 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0
+	 * 获取 开始 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0
 	 * @return displayTypeStart
 	 */
 	public Integer getDisplayTypeStart(){
@@ -389,7 +390,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 设置 开始 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0
+	 * 设置 开始 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0
 	 * @param displayTypeStart
 	 */
 	public void setDisplayTypeStart(Integer displayTypeStart){
@@ -397,7 +398,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 获取 结束 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0
+	 * 获取 结束 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0
 	 * @return displayTypeEnd
 	 */
 	public Integer getDisplayTypeEnd(){
@@ -405,7 +406,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 设置 结束 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0
+	 * 设置 结束 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0
 	 * @param displayTypeEnd
 	 */
 	public void setDisplayTypeEnd(Integer displayTypeEnd){
@@ -413,7 +414,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 获取 增加 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0
+	 * 获取 增加 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0
 	 * @return displayTypeIncrement
 	 */
 	public Integer getDisplayTypeIncrement(){
@@ -421,7 +422,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 设置 增加 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0
+	 * 设置 增加 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0
 	 * @param displayTypeIncrement
 	 */
 	public void setDisplayTypeIncrement(Integer displayTypeIncrement){
@@ -429,7 +430,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 获取 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0
+	 * 获取 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0
 	 * @return displayTypeList
 	 */
 	public List<Integer> getDisplayTypeList(){
@@ -437,7 +438,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 设置 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，默认：0
+	 * 设置 展现类型，0：普通文本框，1：多行文本框，2：开关，3：块输入框，4：密码输入框，默认：0
 	 * @param displayTypeList
 	 */
 	public void setDisplayTypeList(List<Integer> displayTypeList){
@@ -493,7 +494,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 获取 开始 创建用户
+	 * 获取 开始 创建用户ID
 	 * @return createUserIdStart
 	 */
 	public Long getCreateUserIdStart(){
@@ -501,7 +502,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 设置 开始 创建用户
+	 * 设置 开始 创建用户ID
 	 * @param createUserIdStart
 	 */
 	public void setCreateUserIdStart(Long createUserIdStart){
@@ -509,7 +510,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 获取 结束 创建用户
+	 * 获取 结束 创建用户ID
 	 * @return createUserIdEnd
 	 */
 	public Long getCreateUserIdEnd(){
@@ -517,7 +518,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 设置 结束 创建用户
+	 * 设置 结束 创建用户ID
 	 * @param createUserIdEnd
 	 */
 	public void setCreateUserIdEnd(Long createUserIdEnd){
@@ -525,7 +526,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 获取 增加 创建用户
+	 * 获取 增加 创建用户ID
 	 * @return createUserIdIncrement
 	 */
 	public Long getCreateUserIdIncrement(){
@@ -533,7 +534,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 设置 增加 创建用户
+	 * 设置 增加 创建用户ID
 	 * @param createUserIdIncrement
 	 */
 	public void setCreateUserIdIncrement(Long createUserIdIncrement){
@@ -541,7 +542,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 获取 创建用户
+	 * 获取 创建用户ID
 	 * @return createUserIdList
 	 */
 	public List<Long> getCreateUserIdList(){
@@ -549,7 +550,7 @@ public class ParamQuery extends ParamEntity{
 	}
 
 	/**
-	 * 设置 创建用户
+	 * 设置 创建用户ID
 	 * @param createUserIdList
 	 */
 	public void setCreateUserIdList(List<Long> createUserIdList){

setup-project-manager/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java

 package com.mortals.xhx.base.system.param.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.mortals.framework.common.code.YesNo;
+import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.IParam;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
+import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.param.dao.ParamDao;
 import com.mortals.xhx.base.system.param.model.ParamEntity;
-import com.mortals.xhx.base.system.param.model.ParamQuery;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.stereotype.Service;
 
@@ -31,78 +29,53 @@ import java.util.stream.Collectors;
 @Service("paramService")
 public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, ParamEntity, Long>
         implements ParamService {
-
-    @Override
-    protected String getExtKey(ParamEntity data) {
-        return data.getParamKey();
-    }
-
     @Override
     protected String getCacheName() {
         return "ParamEntity.paramKey";
     }
 
-//    @Override
-//    public void putCache(String key, ParamEntity data) {
-//        cacheService.set(data.getParamKey(), data.getParamValue());
-//    }
-
     @Override
-    public void removeCache(String key) {
+    protected void saveBefore(ParamEntity entity, Context context) throws AppException {
+        //过滤换行符
+        entity.setParamKey(StrUtil.removeAllLineBreaks(entity.getParamKey()));
+        entity.setParamValue(StrUtil.removeAllLineBreaks(entity.getParamValue()));
+        super.saveBefore(entity, context);
     }
 
-    @Override
-    public int remove(Long[] ids, Context context) throws AppException {
-        // 先删缓存
-        for (Long id : ids) {
-            ParamEntity paramEntity = get(id, null);
-            cacheService.del(paramEntity.getParamKey());
-        }
-        removeBefore(ids, context);
-        int iRet = dao.delete(ids);
-        removeAfter(ids, context, iRet);
-        return iRet;
-    }
+
 
     @Override
     public String getValueByKey(String key) {
-        return cacheService.hget(getCacheName(),key,ParamEntity.class).getParamValue();
-        //return cacheService.hget(key);
+        List<ParamEntity> list = this.getCacheList();
+        Map<String, String> keyValueMap = list.parallelStream().collect(Collectors.toMap(x -> x.getParamKey(), y -> y.getParamValue(), (o, n) -> n));
+        return keyValueMap.getOrDefault(key, "");
     }
 
     @Override
     public Map<String, String> getParamByFirstOrganize(String firstOrganize, String... excludeParamKeys) {
-        List<ParamEntity> list =this.getCacheList();
-//        ParamQuery query = new ParamQuery();
-//        query.setFirstOrganize(firstOrganize);
-//        List<ParamEntity> list = this.getDao().getList(query);
+        List<ParamEntity> list = this.getCacheList();
         return list.stream()
-                .filter(f->firstOrganize.equals(f.getFirstOrganize()))
-                .filter(s -> {
-            return !Arrays.asList(excludeParamKeys).contains(s.getParamKey());
-        }).collect(Collectors.toMap(ParamEntity::getParamKey, ParamEntity::getParamValue,(o,n)->n));
+                .filter(f -> firstOrganize.equals(f.getFirstOrganize()))
+                .filter(s ->
+                        !Arrays.asList(excludeParamKeys).contains(s.getParamKey())
+                ).collect(Collectors.toMap(ParamEntity::getParamKey, ParamEntity::getParamValue, (o, n) -> n));
     }
 
     public Map<String, String> getParamBySecondOrganize(String firstOrganize, String secondOrganize, String... excludeParamKeys) {
-
-        List<ParamEntity> list =this.getCacheList();
-//        ParamQuery query = new ParamQuery();
-//        query.setFirstOrganize(firstOrganize);
-//        query.setSecondOrganize(secondOrganize);
-//        List<ParamEntity> list = this.getDao().getList(query);
+        List<ParamEntity> list = this.getCacheList();
         return list.stream()
-                .filter(f->firstOrganize.equals(f.getFirstOrganize()))
-                .filter(f->secondOrganize.equals(f.getSecondOrganize()))
-                .filter(s -> {
-            return !Arrays.asList(excludeParamKeys).contains(s.getParamKey());
-        }).collect(Collectors.toMap(ParamEntity::getParamKey, ParamEntity::getParamValue,(o,n)->n));
+                .filter(f -> firstOrganize.equals(f.getFirstOrganize()))
+                .filter(f -> secondOrganize.equals(f.getSecondOrganize()))
+                .filter(s ->
+                        !Arrays.asList(excludeParamKeys).contains(s.getParamKey())
+                ).collect(Collectors.toMap(ParamEntity::getParamKey, ParamEntity::getParamValue, (o, n) -> n));
     }
 
 
     @Override
     public boolean needRefresh() {
-        if (super.cacheService.isShareCache())//共享缓存，不需要实时刷新
-        {
+        if (super.cacheService.isShareCache()) {
+            //共享缓存如redis，不需要实时刷新
             return false;
         }
         IParam param = this.findByKey(IParam.KEY_PARAM_REFRESH_COUNT);
@@ -130,183 +103,91 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
 
     @Override
     public IParam findByKey(String key) throws AppException {
-        ParamQuery params = new ParamQuery();
-        params.setValidStatus(YesNo.YES.getValue());
-        params.setParamKey(key);
-        List<ParamEntity> list = super.find(params, null);
-        if (list != null && !list.isEmpty()) {
-            return list.get(0);
-        }
-        return null;
+        return this.getCacheList().stream().filter(f -> key.equals(f.getParamKey())).findFirst().orElseGet(() -> null);
     }
 
     @Override
     public List<? extends IParam> findAll() throws AppException {
-        ParamQuery params = new ParamQuery();
-        params.setValidStatus(YesNo.YES.getValue());
-        return super.find(params, null);
+        return this.getCacheList();
     }
 
     @Override
     public boolean containsParamKey(String key) {
-        return cacheService.hget(getCacheName(), key) != null;
+        List<ParamEntity> list = this.getCacheList();
+        Map<String, String> keyValueMap = list.parallelStream().collect(Collectors.toMap(x -> x.getParamKey(), y -> y.getParamValue(), (o, n) -> n));
+        return keyValueMap.containsKey(key);
     }
 
     @Override
     public IParam getParamByKey(String key) {
-        return getExtCache(key);
+        List<ParamEntity> list = this.getCacheList();
+        Map<String, IParam> keyValueMap = list.parallelStream().collect(Collectors.toMap(x -> x.getParamKey(), y -> y, (o, n) -> n));
+        return keyValueMap.get(key);
     }
 
     @Override
     public String getParamValue(String key) {
-        IParam param = wrapParamObject(cacheService.hget(getCacheName(), key));
-//        IParam param = getExtCache(key);
-        if (param != null) {
-            return StringUtils.trim(param.getParamValue());
-        }
-        return "";
+        List<ParamEntity> list = this.getCacheList();
+        Map<String, String> keyValueMap = list.parallelStream().collect(Collectors.toMap(x -> x.getParamKey(), y -> y.getParamValue(), (o, n) -> n));
+        return keyValueMap.getOrDefault(key, "");
     }
 
-    private IParam wrapParamObject(String entityString) {
-        JSONObject jsonObject = JSON.parseObject(entityString);
-        ParamEntity param = new ParamEntity();
-        param.setCreateTime(jsonObject.getDate("createTime"));
-        param.setCreateUserId(jsonObject.getLong("createUserId"));
-        param.setDisplayType(jsonObject.getInteger("displayType"));
-        param.setFirstOrganize(jsonObject.getString("firstOrganize"));
-        param.setId(jsonObject.getLong("id"));
-        param.setModStatus(jsonObject.getInteger("modStatus"));
-        param.setName(jsonObject.getString("name"));
-        param.setParamKey(jsonObject.getString("paramKey"));
-        param.setParamValue(jsonObject.getString("paramValue"));
-        param.setValidStatus(jsonObject.getInteger("validStatus"));
-
-        return param;
-    }
 
     @Override
     public String getParamValue(String key, String defaultValue) {
-        if (containsParamKey(key)) {
-            String value = getParamValue(key);
-            if (StringUtils.isEmpty(value)) {
-                return defaultValue;
-            }
-            return value;
-        } else {
-            log.debug("cannot found key[" + key + "], use default value[" + defaultValue + "]");
+        String value = getParamValue(key);
+        if (StringUtils.isEmpty(value)) {
             return defaultValue;
         }
+        return value;
     }
 
     @Override
     public int getParamIntValue(String key) {
-        ParamEntity extCache = getExtCache(key);
-        IParam param = (IParam) extCache;
-        try {
-            if (param == null) {
-                return 0;
-            }
-            String value = param.getParamValue();
-            if (StringUtils.isEmpty(value)) {
-                return 0;
-            } else {
-                return Integer.parseInt(value);
-            }
-        } catch (Exception e) {
-            return 0;
-        }
+        return DataUtil.converStr2Int(getParamValue(key), 0);
     }
 
     @Override
     public int getParamIntValue(String key, int defaultValue) {
-        if (containsParamKey(key)) {
-            String value = getParamValue(key);
-            if (StringUtils.isEmpty(value)) {
-                return defaultValue;
-            }
-            try {
-                return Integer.parseInt(value);
-            } catch (Exception e) {
-                log.debug("cannot conver key[" + key + "]'s value[" + value + "] to int, use default value[" + defaultValue + "]");
-                return defaultValue;
-            }
-        } else {
-            log.debug("cannot found key[" + key + "], use default value[" + defaultValue + "]");
-            return defaultValue;
-        }
+        return DataUtil.converStr2Int(getParamValue(key), defaultValue);
     }
 
     @Override
     public long getParamLongValue(String key) {
-        IParam param = getExtCache(key);
-        try {
-            if (param == null) {
-                return 0;
-            }
-            String value = param.getParamValue();
-            if (StringUtils.isEmpty(value)) {
-                return 0;
-            } else {
-                return Long.parseLong(value);
-            }
-        } catch (Exception e) {
-            return 0;
-        }
+        return DataUtil.converStr2Long(getParamValue(key), 0L);
     }
 
     @Override
     public long getParamLongValue(String key, long defaultValue) {
-        if (containsParamKey(key)) {
-            String value = getParamValue(key);
-            if (StringUtils.isEmpty(value)) {
-                return defaultValue;
-            }
-            try {
-                return Long.parseLong(value);
-            } catch (Exception e) {
-                log.debug("cannot conver key[" + key + "]'s value[" + value + "] to long, use default value[" + defaultValue + "]");
-                return defaultValue;
-            }
-        } else {
-            log.debug("cannot found key[" + key + "], use default value[" + defaultValue + "]");
-            return defaultValue;
-        }
+        return DataUtil.converStr2Long(getParamValue(key), defaultValue);
     }
 
     @Override
     public boolean getParamBooleanValue(String key) {
-        IParam param = getExtCache(key);
+        String value = getParamValue(key);
+        if (StringUtils.isEmpty(value)) {
+            return false;
+        }
         try {
-            if (param == null) {
-                return false;
-            }
-            String value = param.getParamValue();
-            if (StringUtils.isEmpty(value)) {
-                return false;
-            } else {
-                return Boolean.parseBoolean(value);
-            }
+            return Boolean.parseBoolean(value);
         } catch (Exception e) {
             return false;
         }
+
     }
 
     @Override
     public boolean getParamBooleanValue(String key, boolean defaultValue) {
-        if (containsParamKey(key)) {
-            String value = getParamValue(key);
-            if (StringUtils.isEmpty(value)) {
-                return defaultValue;
-            }
-            try {
-                return Boolean.parseBoolean(value);
-            } catch (Exception e) {
-                log.debug("cannot conver key[" + key + "]'s value[" + value + "] to boolean, use default value[" + defaultValue + "]");
-                return defaultValue;
-            }
-        } else {
-            log.debug("cannot found key[" + key + "], use default value[" + defaultValue + "]");
+        String value = getParamValue(key);
+        if (StringUtils.isEmpty(value)) {
             return defaultValue;
         }
+        try {
+            return Boolean.parseBoolean(value);
+        } catch (Exception e) {
+            log.debug("cannot conver key[" + key + "]'s value[" + value + "] to boolean, use default value[" + defaultValue + "]");
+            return defaultValue;
+        }
+
     }
 }
\ No newline at end of file

setup-project-manager/src/main/java/com/mortals/xhx/base/system/param/web/ParamController.java

-/**
- * 文件：ParamController.java
- * 版本：1.0.0
- * 日期：
- * Copyright ®
- * All right reserved.
- */
 package com.mortals.xhx.base.system.param.web;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.mortals.framework.annotation.RepeatSubmit;
 import com.mortals.framework.common.code.PageDisplayType;
 import com.mortals.framework.model.Context;
-
 import com.mortals.framework.util.FileUtil;
-import com.mortals.xhx.common.model.UserInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.mortals.framework.web.BaseCRUDJsonMappingController;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.model.ParamEntity;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.DataSatusEnum;
 import com.mortals.xhx.common.code.ModStatusEnum;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * <p>Title: 参数信息</p>
- * <p>Description: ParamController  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author
- * @version 1.0.0
+ * 参数信息
+ *
+ * @author: zxfei
+ * @date: 2022/5/7 15:38
  */
 @RestController
 @RequestMapping("param")
-public class ParamController extends BaseCRUDJsonMappingController<ParamService, ParamForm, ParamEntity, Long> {
+public class ParamController extends BaseCRUDJsonBodyMappingController<ParamService, ParamEntity, Long> {
 
     public ParamController() {
         super.setFormClass(ParamForm.class);
@@ -49,21 +31,17 @@ public class ParamController extends BaseCRUDJsonMappingController<ParamService,
     }
 
     @Override
-    protected void init(HttpServletRequest request, HttpServletResponse response, ParamForm form,
-                        Map<String, Object> model, Context context) {
+    protected void init(Map<String, Object> model, Context context) {
         Map<String, Object> status = new HashMap<String, Object>();
         status.put("validStatus", DataSatusEnum.getEnumMap(DataSatusEnum.CLOSE.getValue(),
                 DataSatusEnum.DELETE.getValue(), DataSatusEnum.OVERDUE.getValue(), DataSatusEnum.USEOUT.getValue()));
         status.put("modStatus", ModStatusEnum.getEnumMap());
         status.put("displayType", getPageDisplayType());
         model.put(KEY_RESULT_DICT, status);
-
-        super.init(request, response, form, model, context);
     }
 
 
     private Map<String, Object> getPageDisplayType() {
-
         PageDisplayType[] pageDisplayTypes = PageDisplayType.values();
         Map<String, Object> result = new HashMap<>(pageDisplayTypes.length);
         for (PageDisplayType pageDisplayType : pageDisplayTypes) {
@@ -72,7 +50,6 @@ public class ParamController extends BaseCRUDJsonMappingController<ParamService,
         return result;
     }
 
-
     public static void main(String[] args) {
         FileUtil.delete("E:\\pic\\1.png");
     }

setup-project-manager/src/main/java/com/mortals/xhx/base/system/task/dao/ibatis/TaskDaoImpl.java

@@ -11,7 +11,6 @@ package com.mortals.xhx.base.system.task.dao.ibatis;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.xhx.base.system.task.dao.TaskDao;
 import com.mortals.xhx.base.system.task.model.TaskEntity;
-
 import org.springframework.stereotype.Repository;
 /**
  * <p>Title: 任务信息</p>

setup-project-manager/src/main/java/com/mortals/xhx/base/system/task/model/TaskEntity.java

@@ -8,11 +8,11 @@
 
 package com.mortals.xhx.base.system.task.model;
 
-import java.util.Date;
-
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.framework.service.ITask;
 
+import java.util.Date;
+
 /**
  * <p>Title: 任务信息</p>
  * <p>Description: TaskEntity  </p>

setup-project-manager/src/main/java/com/mortals/xhx/base/system/task/service/impl/TaskServiceImpl.java

@@ -4,17 +4,7 @@
 
 package com.mortals.xhx.base.system.task.service.impl;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.net.NetUtil;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.code.ExcuteStatus;
 import com.mortals.framework.common.code.TaskExcuteStrategy;
@@ -25,11 +15,16 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.springcloud.service.IApplicationStartedService;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.StringUtils;
-import com.mortals.framework.util.SystemUtil;
 import com.mortals.xhx.base.system.task.dao.TaskDao;
 import com.mortals.xhx.base.system.task.model.TaskEntity;
 import com.mortals.xhx.base.system.task.model.TaskQuery;
 import com.mortals.xhx.base.system.task.service.TaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * <p>
@@ -62,7 +57,7 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
 
     private Thread thread = null;
     /** 日志打印时间，key：任务ID，value：最后一次打印日志时间 */
-    private Map<Long, Long> printLogTime = new HashMap<Long, Long>();
+    private Map<Long, Long> printLogTime = new HashMap<>();
     @Autowired(required=false)
     private TaskService taskService;
 
@@ -153,8 +148,10 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
 
     @Override
     public void start() throws AppException {
-        final String localIp = SystemUtil.getLocalHostIp();
+       // final String localIp = SystemUtil.getLocalHostIp();
+        final String localIp = NetUtil.getLocalhostStr();
         log.info("任务执行线程启动...-->" + localIp);
+        log.info("other get Ip...-->" + NetUtil.getLocalhostStr());
         thread = new Thread(() -> {
             // 将本机上次执行而未完成的任务状态变更
             try {
@@ -216,17 +213,17 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
                                 }
                                 if (interimExcuteStatus != TaskInterimExcuteStatus.UNUSE.getValue() // 启用立即执行
                                         || ((strategy == TaskExcuteStrategy.DAY.getValue() // 按天
-                                                || (strategy == TaskExcuteStrategy.WEEK.getValue()
-                                                        && week == excuteDate)
-                                // 按周
-                                                || (strategy == TaskExcuteStrategy.MONTH.getValue()
-                                                        && (day == excuteDate
-                                                                || (excuteDate > maxDay && day == maxDay))))// 按月
-                                                && (excuteTime == currTime
-                                                        && !lastExcuteTimeStr.equals(currDateTimeStr)) // 执行间隔最少为一天
+                                        || (strategy == TaskExcuteStrategy.WEEK.getValue()
+                                        && week == excuteDate)
+                                        // 按周
+                                        || (strategy == TaskExcuteStrategy.MONTH.getValue()
+                                        && (day == excuteDate
+                                        || (excuteDate > maxDay && day == maxDay))))// 按月
+                                        && (excuteTime == currTime
+                                        && !lastExcuteTimeStr.equals(currDateTimeStr)) // 执行间隔最少为一天
                                 ) || (strategy == TaskExcuteStrategy.INTERVAL.getValue() // 按间隔时间
                                         && (lastExcuteTime == null || lastExcuteTime.getTime()
-                                                + excuteDate * 1000 <= currDateTime.getTime()))) {
+                                        + excuteDate * 1000 <= currDateTime.getTime()))) {
                                     final boolean printLog = checkPrintLog(task);
                                     Object excuteBean = GlobalSysInfo.getBeanByName(task.getExcuteService());
                                     if (excuteBean == null || !(excuteBean instanceof ITaskExcuteService)) {
@@ -261,7 +258,7 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
                                                         log.error("执行任务失败-->" + excuteTask, e);
                                                     }
                                                     if (strategy == TaskExcuteStrategy.INTERVAL.getValue()) {
-                                                     // 按间隔时间,更新执行时间，避免一直重复执行
+                                                        // 按间隔时间,更新执行时间，避免一直重复执行
                                                         excuteTask.setLastExcuteTime(currDateTime);
                                                     }
                                                 } finally {
@@ -297,7 +294,7 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
             executorService.shutdown();
             log.info("任务执行线程退出!");
         });
-       // thread.start();
+        thread.start();
     }
 
     @Override

setup-project-manager/src/main/java/com/mortals/xhx/base/system/task/web/TaskController.java

-/**
- * 文件：TaskController.java
- * 版本：1.0.0
- * 日期：
- * Copyright ®
- * All right reserved.
- */
 package com.mortals.xhx.base.system.task.web;
 
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ITaskExcuteService;
-import com.mortals.framework.web.BaseCRUDJsonMappingController;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.task.model.TaskEntity;
+import com.mortals.xhx.base.system.task.model.TaskQuery;
 import com.mortals.xhx.base.system.task.service.TaskService;
 import com.mortals.xhx.common.code.DataSatusEnum;
 import com.mortals.xhx.common.code.TaskExcuteStatusEnum;
 import com.mortals.xhx.common.code.TaskExcuteStrategyEnum;
 import com.mortals.xhx.common.code.TaskInterimExcuteStatusEnum;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
- * <p>Title: 任务信息</p>
- * <p>Description: TaskController  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author
- * @version 1.0.0
+ * 任务信息
+ *
+ * @author: zxfei
+ * @date: 2022/5/7 15:39
  */
 @RestController
 @RequestMapping("task")
-public class TaskController extends BaseCRUDJsonMappingController<TaskService, TaskForm, TaskEntity, Long> {
+public class TaskController extends BaseCRUDJsonBodyMappingController<TaskService, TaskEntity, Long> {
 
     public TaskController() {
         super.setFormClass(TaskForm.class);
@@ -50,8 +37,7 @@ public class TaskController extends BaseCRUDJsonMappingController<TaskService, T
 
 
     @Override
-    protected void init(HttpServletRequest request, HttpServletResponse response, TaskForm form,
-                        Map<String, Object> model, Context context) {
+    protected void init(Map<String, Object> model, Context context) {
         Map<String, Object> status = new HashMap<String, Object>();
         status.put("status", TaskExcuteStatusEnum.getEnumMap());
         status.put("excuteStrategy", TaskExcuteStrategyEnum.getEnumMap());
@@ -71,60 +57,30 @@ public class TaskController extends BaseCRUDJsonMappingController<TaskService, T
         }
         model.put("excuteService", serviceList);
         model.put(KEY_RESULT_DICT, status);
-        super.init(request, response, form, model, context);
-    }
-
-    /**
-     * @param request
-     * @param response
-     * @param form
-     * @param model
-     * @param context
-     * @throws AppException
-     * @Description: TODO
-     */
-
-    @Override
-    protected void saveBefore(HttpServletRequest request, HttpServletResponse response, TaskForm form,
-                              Map<String, Object> model, Context context) throws AppException {
-        if (null == form.getEntity().getExcuteService()) {
-
-        }
-//		TaskEntity condition = new TaskEntity();
-//		condition.setExcuteService(form.getEntity().getExcuteService());
-//		List<TaskEntity> datas = this.service.find(condition, context);
-//		if (null != datas && datas.size() > 0) {
-//			for (TaskEntity entity : datas) {
-//				if (entity.getId().longValue() != form.getEntity().getId().longValue()) {
-//					throw new AppException("任务已存在，请勿重复配置");
-//				}
-//			}
-//		}
-        super.saveBefore(request, response, form, model, context);
     }
 
     /**
      * 改变状态
      */
     @RequestMapping(value = "change/status")
-    public String changeStatus(HttpServletRequest request, HttpServletResponse response, TaskForm form) {
+    public String changeStatus(TaskQuery query) {
         JSONObject ret = new JSONObject();
         Context context = getContext();
         try {
-            TaskEntity entity = this.service.get(form.getEntity().getId(), context);// .doSubmitAudit(form.getEntity(),
+            TaskEntity entity = this.service.get(query.getId(), context);// .doSubmitAudit(form.getEntity(),
             // context);
             if (null == entity) {
                 throw new AppException("任务不存在!");
             }
-            if (null == form.getEntity().getStatus()) {
+            if (null == query.getStatus()) {
                 throw new AppException("任务状态不能为空!");
             }
-            if (form.getEntity().getStatus() != DataSatusEnum.ENABLE.getValue()
-                    && form.getEntity().getStatus() != DataSatusEnum.DISENABLE.getValue()) {
+            if (query.getStatus() != DataSatusEnum.ENABLE.getValue()
+                    && query.getStatus() != DataSatusEnum.DISENABLE.getValue()) {
                 throw new AppException("非法任务状态!");
             }
-            String busiDesc = DataSatusEnum.getByValue(form.getEntity().getStatus()).getDesc();
-            entity.setStatus(form.getEntity().getStatus());
+            String busiDesc = DataSatusEnum.getByValue(query.getStatus()).getDesc();
+            entity.setStatus(query.getStatus());
             this.service.update(entity, context);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             ret.put(KEY_RESULT_MSG, busiDesc + "成功");

setup-project-manager/src/main/java/com/mortals/xhx/daemon/task/CheckProjectStatusTaskImpl.java

 package com.mortals.xhx.daemon.task;
 
+import cn.hutool.http.HttpUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
@@ -10,6 +11,7 @@ import com.mortals.xhx.module.setup.service.SetupProjectService;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -24,6 +26,9 @@ public class CheckProjectStatusTaskImpl implements ITaskExcuteService {
     @Autowired
     private SetupProjectService setupProjectService;
 
+    @Value("${project.nacosUrl}")
+    private String nacosUrl;
+
 
     @Override
     public void excuteTask(ITask task) throws AppException {
@@ -33,6 +38,9 @@ public class CheckProjectStatusTaskImpl implements ITaskExcuteService {
         for (SetupProjectEntity setupProjectEntity : setupProjectEntities) {
             if (ProjectTypeEnum.后端.getValue() == setupProjectEntity.getProjectType()) {
             //todo
+                String resp = HttpUtil.get(nacosUrl + "/v1/ns/catalog/instances?serviceName=" + setupProjectEntity.getProjectCode() + "&clusterName=DEFAULT&groupName=DEFAULT_GROUP&pageSize=10&pageNo=1&namespaceId=smart-gov");
+                log.info("服务实例详细查询返回:{}", resp);
+
             } else if (ProjectTypeEnum.前端.getValue() == setupProjectEntity.getProjectType()) {
             //todo
             }

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/web/SetupProjectController.java

@@ -225,13 +225,11 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se
 
             if (YesNoEnum.YES.getValue() == rest.getCode()) {
                 ret.put(KEY_RESULT_MSG, "更新事项命令下发成功!");
-                SetupProjectEntity setupProjectEntity = new SetupProjectEntity();
-                setupProjectEntity.setId(siteEntity.getId());
-                setupProjectEntity.setAreaCode(siteEntity.getAreaCode());
-                this.service.update(setupProjectEntity);
+                this.service.update(setupProject);
+            }else{
+                ret.put(KEY_RESULT_MSG, "更新事项命令下发失败");
             }
 
-            ret.put(KEY_RESULT_MSG, "更新事项命令下发失败");
         } catch (Exception e) {
             code = VALUE_RESULT_FAILURE;
             log.error("更新事项命令下发失败", e);