Merge branch 'develop_tzs_dev_nacos' into develop_tzs_dev_nacos_jyjc

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

 package com.yeejoin.amos.boot.biz.common.workflow.feign;
 
-import java.util.HashMap;
-
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+
 import java.text.ParseException;
+import java.util.HashMap;
 import java.util.Map;
 
-import com.alibaba.fastjson.JSONObject;
-
-import feign.Response;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration =
+@FeignClient(name = "AMOS-API-WORKFLOW-TZS", path = "workflow-tzs", configuration =
 		{ CommonMultipartSupportConfig.class })
 public interface WorkflowFeignService {
 	/**

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/WechatController.java

@@ -27,6 +27,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
 import com.yeejoin.amos.feign.privilege.model.LoginInfoModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import io.swagger.annotations.Api;
@@ -314,7 +315,7 @@ public class WechatController extends BaseController {
 		startPlatformTokenService.getToken();
 		logger.info("========================请求登录接口token" + RequestContext.getToken());
 		FeignClientResult<LoginInfoModel> loginInfo = Privilege.agencyUserClient.getLoginInfo(model.getPhone());
-		String passwd = DesUtil.encode("a_" + model.getPhone(), "qaz");
+		String passwd = PwdUtil.encode("a_" + model.getPhone());
 		if (loginInfo == null || loginInfo.getResult() == null) {
 			AgencyUserModel agencyUserModel = new AgencyUserModel();
 			agencyUserModel.setUserName(model.getPhone());

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/SafetyServiceImpl.java

 package com.yeejoin.amos.boot.module.elevator.biz.service.impl;
 
 import com.yeejoin.amos.boot.module.elevator.api.common.CommonException;
-import com.yeejoin.amos.boot.module.elevator.api.common.DesUtil;
 import com.yeejoin.amos.boot.module.elevator.api.common.MobileLoginParam;
-import com.yeejoin.amos.boot.module.elevator.api.enums.PersonCheckStatus;
 import com.yeejoin.amos.boot.module.elevator.api.enums.PhoneRegisterTypeEum;
 import com.yeejoin.amos.boot.module.elevator.api.service.ISafetyService;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.RedisUtil;
-import com.yeejoin.amos.boot.module.elevator.flc.api.entity.RegUnitInfo;
 import com.yeejoin.amos.boot.module.elevator.flc.api.feign.PrivilegeFeginService;
 import com.yeejoin.amos.boot.module.elevator.flc.api.mapper.RegUnitInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-
-
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.VerifyCodeAuthModel;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Author cpp
@@ -105,7 +101,7 @@ public class SafetyServiceImpl implements ISafetyService {
        //验证手机号是否注册过
         VerifyCodeAuthModel model = new VerifyCodeAuthModel();
         model.setLoginId(param.getPhoneNo());
-        model.setVerifyCode(DesUtil.encode(param.getPhoneNo(), param.getPhoneNo()));
+        model.setVerifyCode(PwdUtil.encode(param.getPhoneNo()));
         FeignClientResult<Map<String, String>> mobileVerifyCodeResult = new FeignClientResult<>();
         RequestContext.setToken("token");
         RequestContext.setProduct(product);

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/application-dev.properties

@@ -16,6 +16,12 @@ spring.cloud.nacos.config.namespace=qa
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 spring.cloud.nacos.config.file-extension=properties
 
+#DB properties:
+spring.datasource.url=jdbc:postgresql://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
+spring.datasource.username=admin
+spring.datasource.password=Yeejoin@2023
+spring.datasource.hikari.register-mbeans=true
+
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/resources/application-dev.properties

@@ -16,6 +16,12 @@ spring.cloud.nacos.config.namespace=qa
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 spring.cloud.nacos.config.file-extension=properties
 
+#DB properties:
+spring.datasource.url=jdbc:postgresql://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
+spring.datasource.username=admin
+spring.datasource.password=Yeejoin@2023
+spring.datasource.hikari.register-mbeans=true
+
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/controller/WechatController.java

@@ -7,14 +7,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
-import com.yeejoin.amos.boot.module.cylinder.biz.utils.HttpUtils;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.SignatureDto;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.WechatAccessDto;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.WechatMyBusinessListDto;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.WechatMyBussinessDto;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.WechatMyTaskListDto;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.WechatRelationDto;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.WechatTaskLatLonDto;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.*;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.DispatchTask;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.WechatRelation;
@@ -24,11 +17,13 @@ import com.yeejoin.amos.boot.module.cylinder.biz.service.impl.AlertCalledService
 import com.yeejoin.amos.boot.module.cylinder.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.cylinder.biz.service.impl.DispatchTaskServiceImpl;
 import com.yeejoin.amos.boot.module.cylinder.biz.service.impl.WechatRelationServiceImpl;
+import com.yeejoin.amos.boot.module.cylinder.biz.utils.HttpUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import io.swagger.annotations.Api;
@@ -42,13 +37,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -66,13 +55,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 微信公众号controller
@@ -311,7 +294,7 @@ public class WechatController extends BaseController {
 				|| ValidationUtil.isEmpty(model.getCode()))
 			throw new BadRequest("参数校验失败.");
 		AgencyUserModel agencyUserModel = new AgencyUserModel();
-		String passwd = DesUtil.encode("a_" + model.getPhone(), "qaz");
+		String passwd = PwdUtil.encode("a_" + model.getPhone());
 		agencyUserModel.setUserName(model.getPhone());
 		agencyUserModel.setRealName(model.getPhone());
 		agencyUserModel.setLockStatus("UNLOCK");

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/service/impl/SafetyServiceImpl.java

 package com.yeejoin.amos.boot.module.cylinder.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.cylinder.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.cylinder.api.common.CommonException;
-import com.yeejoin.amos.boot.module.cylinder.api.common.DesUtil;
 import com.yeejoin.amos.boot.module.cylinder.api.common.MobileLoginParam;
-import com.yeejoin.amos.boot.module.cylinder.api.enums.PersonCheckStatus;
 import com.yeejoin.amos.boot.module.cylinder.api.enums.PhoneRegisterTypeEum;
 import com.yeejoin.amos.boot.module.cylinder.api.service.ISafetyService;
+import com.yeejoin.amos.boot.module.cylinder.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.feign.PrivilegeFeginService;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.RegUnitInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-
-
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.VerifyCodeAuthModel;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Author cpp
@@ -104,7 +101,7 @@ public class SafetyServiceImpl implements ISafetyService {
        //验证手机号是否注册过
         VerifyCodeAuthModel model = new VerifyCodeAuthModel();
         model.setLoginId(param.getPhoneNo());
-        model.setVerifyCode(DesUtil.encode(param.getPhoneNo(), param.getPhoneNo()));
+        model.setVerifyCode(PwdUtil.encode(param.getPhoneNo()));
         FeignClientResult<Map<String, String>> mobileVerifyCodeResult = new FeignClientResult<>();
         RequestContext.setToken("token");
         RequestContext.setProduct(product);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/WorkFlowFeignService.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = {XidFeignConfiguration.class})
+@FeignClient(name = "AMOS-API-WORKFLOW-TZS", path = "workflow-tzs", configuration = {XidFeignConfiguration.class})
 public interface WorkFlowFeignService {
 
     /***

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/WechatController.java

@@ -7,13 +7,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
-import com.yeejoin.amos.boot.module.tcm.api.dto.SignatureDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.WechatAccessDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.WechatMyBusinessListDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.WechatMyBussinessDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.WechatMyTaskListDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.WechatRelationDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.WechatTaskLatLonDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.*;
 import com.yeejoin.amos.boot.module.tcm.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.tcm.api.entity.DispatchTask;
 import com.yeejoin.amos.boot.module.tcm.api.entity.WechatRelation;
@@ -29,6 +23,7 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import io.swagger.annotations.Api;
@@ -42,13 +37,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -66,13 +55,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 微信公众号controller
@@ -311,7 +294,7 @@ public class WechatController extends BaseController {
 				|| ValidationUtil.isEmpty(model.getCode()))
 			throw new BadRequest("参数校验失败.");
 		AgencyUserModel agencyUserModel = new AgencyUserModel();
-		String passwd = DesUtil.encode("a_" + model.getPhone(), "qaz");
+		String passwd = PwdUtil.encode("a_" + model.getPhone());
 		agencyUserModel.setUserName(model.getPhone());
 		agencyUserModel.setRealName(model.getPhone());
 		agencyUserModel.setLockStatus("UNLOCK");

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/SafetyServiceImpl.java

@@ -14,6 +14,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.VerifyCodeAuthModel;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,7 +104,7 @@ public class SafetyServiceImpl implements ISafetyService {
        //验证手机号是否注册过
         VerifyCodeAuthModel model = new VerifyCodeAuthModel();
         model.setLoginId(param.getPhoneNo());
-        model.setVerifyCode(DesUtil.encode(param.getPhoneNo(), param.getPhoneNo()));
+        model.setVerifyCode(PwdUtil.encode(param.getPhoneNo()));
         FeignClientResult<Map<String, String>> mobileVerifyCodeResult = new FeignClientResult<>();
         RequestContext.setToken("token");
         RequestContext.setProduct(product);

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -65,7 +65,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.GroupModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -2159,7 +2159,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             CompanyModel companyModel = getCompanyModelUseCache(tzsUserInfo, companyCodeCompanyMap);
             String companyType = companyModel.getCompanyType();
             // 默认的密码
-            String passwd = DesUtil.encode("a_" + tzsUserInfo.getPhone(), "qaz");
+            String passwd = PwdUtil.encode("a_" + tzsUserInfo.getPhone());
             // 获取对应单位类型下的引用并去重
             Set<String> appCodesSet = getAppKeys(userImportDto, dataDictionaryMap);
             Set<Long> roleIds = new HashSet<>();

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/request/MyIdGeneratorConfig.java

@@ -18,27 +18,30 @@ import java.io.Serializable;
  */
 public class MyIdGeneratorConfig implements IdentifierGenerator {
 
-
     /**
      * 终端ID
      */
-    @Value("${generator.worker_id}")
+    @Value("${generator.worker_id:0}")
     public long WORKER_ID;
 
     /**
      * 数据中心id
      */
-    @Value("${generator.datacenter_id}")
+    @Value("${generator.datacenter_id:0}")
     public long DATACENTER_ID;
 
-    private Snowflake snowflake = IdUtil.createSnowflake(WORKER_ID, DATACENTER_ID);
+    private Snowflake snowflake;
 
     @PostConstruct
     public void init() {
         WORKER_ID = NetUtil.ipv4ToLong(NetUtil.getLocalhostStr());
+        snowflake = IdUtil.createSnowflake(WORKER_ID, DATACENTER_ID);
     }
 
     public synchronized long snowflakeId() {
+        if (snowflake == null) {
+            snowflake = IdUtil.createSnowflake(WORKER_ID, DATACENTER_ID);
+        }
         return snowflake.nextId();
     }
 
@@ -47,13 +50,10 @@ public class MyIdGeneratorConfig implements IdentifierGenerator {
         return snowflake.nextId();
     }
 
-
     @Override
     public Serializable generate(SharedSessionContractImplementor session, Object object)
             throws HibernateException {
         return snowflakeId(WORKER_ID, DATACENTER_ID);
     }
 
-
-
 }

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/Plan.java

@@ -2,60 +2,62 @@ package com.yeejoin.amos.patrol.dao.entity;
 
 import org.springframework.data.annotation.LastModifiedDate;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import javax.persistence.*;
 import java.sql.Time;
 import java.util.Date;
 
-
 /**
  * The persistent class for the p_plan database table.
  * 
  */
 @Entity
-@Table(name="p_plan")
-@NamedQuery(name="Plan.findAll", query="SELECT p FROM Plan p")
+@Table(name = "p_plan")
+@NamedQuery(name = "Plan.findAll", query = "SELECT p FROM Plan p")
 public class Plan extends BasicEntity {
 	private static final long serialVersionUID = 1L;
 	/**
 	 * 部门id
 	 */
-	@Column(name="dept_id")
+	@Column(name = "dept_id")
 	private String deptId;
 	/**
 	 * 创建者
 	 */
-	@Column(name="create_by")
+	@Column(name = "create_by")
 	private String createBy;
 
 	/**
 	 * 开始时间
 	 */
-	@Column(name="day_begin")
+	@Column(name = "day_begin")
+	@JsonDeserialize(using = TimeDeserializer.class)
 	private Time dayBegin;
 	/**
 	 * 结束时间
 	 */
-	@Column(name="day_end")
+	@Column(name = "day_end")
+	@JsonDeserialize(using = TimeDeserializer.class)
 	private Time dayEnd;
 	/**
 	 * 执行间隔（每天执行频率为多次时使用）
 	 */
-	@Column(name="day_interval")
+	@Column(name = "day_interval")
 	private int dayInterval;
 	/**
 	 * 执行间隔单位：小时，分钟，秒
 	 */
-	@Column(name="day_interval_unit")
+	@Column(name = "day_interval_unit")
 	private String dayIntervalUnit;
 	/**
 	 * 每天频率：0-一次；1-多次
 	 */
-	@Column(name="day_rate")
+	@Column(name = "day_rate")
 	private int dayRate = -1;
 	/**
 	 * 开始时间（执行频率为一次时，使用）
 	 */
-	@Column(name="day_time")
+	@Column(name = "day_time")
 	private String dayTime;
 	/**
 	 * 工作时长（分钟）
@@ -73,82 +75,82 @@ public class Plan extends BasicEntity {
 	/**
 	 * 执行频率（年计划使用）
 	 */
-	@Column(name="execute_rate")
+	@Column(name = "execute_rate")
 	private int executeRate;
 	/**
 	 * 排序
 	 */
-	@Column(name="in_order")
+	@Column(name = "in_order")
 	private String inOrder;
 
 	/**
 	 * 执行间隔
 	 */
-	@Column(name="execute_interval")
+	@Column(name = "execute_interval")
 	private int executeInterval;
 	/**
 	 * 是否固定巡检日期：0-否；1-是
 	 */
-	@Column(name="is_fixed_date")
+	@Column(name = "is_fixed_date")
 	private String isFixedDate;
 	/**
 	 * 是否评分
 	 */
-	@Column(name="is_score")
+	@Column(name = "is_score")
 	private String isScore;
 	/**
 	 * 最近更新者
 	 */
-	@Column(name="last_upd_by")
+	@Column(name = "last_upd_by")
 	private String lastUpdBy;
 	/**
 	 * 最近更新时间
 	 */
 	@LastModifiedDate
-	@Column(name="last_upd_time")
+	@Column(name = "last_upd_time")
 	private Date lastUpdTime;
 	/**
 	 * 最少间隔
 	 */
-	@Column(name="min_space")
+	@Column(name = "min_space")
 	private int minSpace;
 	/**
 	 * 月执行类型：第，在
 	 */
-	@Column(name="month_type")
+	@Column(name = "month_type")
 	private String monthType;
 	/**
 	 * 计划名称
 	 */
-	@Column(name="[name]")
+	@Column(name = "[name]")
 	private String name;
 	/**
 	 * 下次任务生成日期
 	 */
 	@Temporal(TemporalType.DATE)
-	@Column(name="next_gen_date")
+	@Column(name = "next_gen_date")
 	private Date nextGenDate;
 	/**
 	 * 公司Id
 	 */
-	@Column(name="org_code")
+	@Column(name = "org_code")
 	private String orgCode;
 	/**
 	 * 计划开始日期
 	 */
 	@Temporal(TemporalType.DATE)
-	@Column(name="plan_begin")
+	@Column(name = "plan_begin")
 	private String planBegin;
 	/**
 	 * 计划结束日期
 	 */
 	@Temporal(TemporalType.DATE)
-	@Column(name="plan_end")
+	@Column(name = "plan_end")
 	private String planEnd;
 	/**
 	 * 计划类型：日，周，月，年
 	 */
-	@Column(name="plan_type")
+	@Column(name = "plan_type")
 	private String planType;
 	/**
 	 * 备注
@@ -165,54 +167,54 @@ public class Plan extends BasicEntity {
 	/**
 	 * 路线编号
 	 */
-	@Column(name="route_id")
+	@Column(name = "route_id")
 	private long routeId;
 	/**
 	 * 评分计算公式
 	 */
-	@Column(name="score_formula")
+	@Column(name = "score_formula")
 	private String scoreFormula;
 	/**
 	 * 状态:0-已停用；1-正常
 	 */
-	@Column(name="[status]")
+	@Column(name = "[status]")
 	private byte status;
 	/**
 	 * 用户编号
 	 */
-	@Column(name="user_id")
+	@Column(name = "user_id")
 	private String userId;
 	/**
 	 * 开始编号
 	 */
-	@Column(name="week_begin_num")
+	@Column(name = "week_begin_num")
 	private int weekBeginNum;
 	/**
 	 * 周几
 	 */
-	@Column(name="week_day")
+	@Column(name = "week_day")
 	private int weekDay;
 	/**
 	 * 结束编号
 	 */
-	@Column(name="week_end_num")
+	@Column(name = "week_end_num")
 	private int weekEndNum;
 	/**
 	 * 哪一天
 	 */
-	@Column(name="what_day")
+	@Column(name = "what_day")
 	private String whatDay;
 	/**
 	 * 第几周
 	 */
-	@Column(name="what_week")
+	@Column(name = "what_week")
 	private int whatWeek;
 
 	/**
 	 * 是否删除：0表示未删除，1表示已删除
 	 */
-	@Column(name="is_delete")
-	private boolean isDelete=false;
+	@Column(name = "is_delete")
+	private boolean isDelete = false;
 
 	/**
 	 * 原始字段
@@ -224,27 +226,26 @@ public class Plan extends BasicEntity {
 	 * 
 	 * 任务id
 	 */
-	@Column(name="plan_task_id")
+	@Column(name = "plan_task_id")
 	private Long planTaskId = 0L;
 
 	/**
 	 * 是否单人执行
 	 */
-	@Column(name="is_single_execution")
-	private boolean isSingleExecution=false;
+	@Column(name = "is_single_execution")
+	private boolean isSingleExecution = false;
 
 	/**
 	 * 用户部门
 	 */
-	@Column(name="user_dept")
+	@Column(name = "user_dept")
 	private String userDept;
 
-
-	//单位code
+	// 单位code
 	@Column(name = "biz_org_code")
 	private String bizOrgCode;
 
-	//单位名称
+	// 单位名称
 	@Column(name = "biz_org_name")
 	private String bizOrgName;
 
@@ -297,7 +298,6 @@ public class Plan extends BasicEntity {
 		this.createBy = createBy;
 	}
 
-
 	public Time getDayBegin() {
 		return this.dayBegin;
 	}
@@ -378,10 +378,6 @@ public class Plan extends BasicEntity {
 		this.inOrder = inOrder;
 	}
 
-
-
-
-
 	public String getIsFixedDate() {
 		return this.isFixedDate;
 	}

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/TimeDeserializer.java

+package com.yeejoin.amos.patrol.dao.entity;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import java.io.IOException;
+import java.sql.Time;
+
+public class TimeDeserializer extends JsonDeserializer<Time> {
+    @Override
+    public Time deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        if (p.getCurrentToken().isNumeric()) {
+            long timeInMillis = p.getLongValue();
+            return new Time(timeInMillis);
+        } else if (p.getCurrentToken().isScalarValue()) {
+            String timeStr = p.getText();
+            if (timeStr != null && !timeStr.isEmpty()) {
+                return Time.valueOf(timeStr);
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/WechatController.java

@@ -7,13 +7,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
-import com.yeejoin.amos.boot.module.ymt.api.dto.SignatureDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.WechatAccessDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.WechatMyBusinessListDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.WechatMyBussinessDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.WechatMyTaskListDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.WechatRelationDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.WechatTaskLatLonDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.ymt.api.entity.DispatchTask;
 import com.yeejoin.amos.boot.module.ymt.api.entity.WechatRelation;
@@ -29,6 +23,7 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import io.swagger.annotations.Api;
@@ -42,13 +37,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -66,13 +55,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 微信公众号controller
@@ -311,7 +294,7 @@ public class WechatController extends BaseController {
 				|| ValidationUtil.isEmpty(model.getCode()))
 			throw new BadRequest("参数校验失败.");
 		AgencyUserModel agencyUserModel = new AgencyUserModel();
-		String passwd = DesUtil.encode("a_" + model.getPhone(), "qaz");
+		String passwd = PwdUtil.encode("a_" + model.getPhone());
 		agencyUserModel.setUserName(model.getPhone());
 		agencyUserModel.setRealName(model.getPhone());
 		agencyUserModel.setLockStatus("UNLOCK");

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/SafetyServiceImpl.java

 package com.yeejoin.amos.boot.module.ymt.biz.service.impl;
 
 import com.yeejoin.amos.boot.module.ymt.api.common.CommonException;
-import com.yeejoin.amos.boot.module.ymt.api.common.DesUtil;
 import com.yeejoin.amos.boot.module.ymt.api.common.MobileLoginParam;
-import com.yeejoin.amos.boot.module.ymt.api.enums.PersonCheckStatus;
 import com.yeejoin.amos.boot.module.ymt.api.enums.PhoneRegisterTypeEum;
 import com.yeejoin.amos.boot.module.ymt.api.service.ISafetyService;
 import com.yeejoin.amos.boot.module.ymt.biz.utils.RedisUtil;
-import com.yeejoin.amos.boot.module.ymt.flc.api.entity.RegUnitInfo;
 import com.yeejoin.amos.boot.module.ymt.flc.api.feign.PrivilegeFeginService;
 import com.yeejoin.amos.boot.module.ymt.flc.api.mapper.RegUnitInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-
-
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.VerifyCodeAuthModel;
+import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Author cpp
@@ -105,7 +101,7 @@ public class SafetyServiceImpl implements ISafetyService {
        //验证手机号是否注册过
         VerifyCodeAuthModel model = new VerifyCodeAuthModel();
         model.setLoginId(param.getPhoneNo());
-        model.setVerifyCode(DesUtil.encode(param.getPhoneNo(), param.getPhoneNo()));
+        model.setVerifyCode(PwdUtil.encode(param.getPhoneNo()));
         FeignClientResult<Map<String, String>> mobileVerifyCodeResult = new FeignClientResult<>();
         RequestContext.setToken("token");
         RequestContext.setProduct(product);

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/feign/WorkFlowFeignService.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = {XidFeignConfiguration.class})
+@FeignClient(name = "AMOS-API-WORKFLOW-TZS", path = "workflow-tzs", configuration = {XidFeignConfiguration.class})
 public interface WorkFlowFeignService {
 
     /***

amos-boot-system-tzs/pom.xml

@@ -17,7 +17,7 @@
         <module>amos-boot-module-96333</module>
         <module>amos-boot-module-common</module>
         <module>amos-boot-module-cylinder</module>
-        <module>amos-boot-module-jczs</module>
+<!--        <module>amos-boot-module-jczs</module> -->
         <module>amos-boot-module-app</module>
         <module>amos-boot-module-tzspatrol</module>
 <!--        <module>amos-boot-module-ys</module>-->