添加修改终端访问ip

setup-project-manager/db/add.sql

-update mortals_xhx_setup_project SET siteId=null,siteCode='',siteName='',areaName='',projectStatus=1;
+update mortals_xhx_setup_project SET siteId=null,siteCode='',siteName='',areaCode='',areaName='',projectStatus=1;
 
 
 ALTER TABLE mortals_xhx_setup_project ADD COLUMN  `clientToServerIp` varchar(255)      COMMENT '终端连接客户端ip' AFTER areaName;
@@ -8,4 +8,6 @@ ALTER TABLE mortals_xhx_setup_project ADD COLUMN   `clientToServerIpStatus` tiny
 ALTER TABLE mortals_xhx_setup_project ADD COLUMN  `innerServerIp` varchar(255)      COMMENT '服务端内部ip' AFTER areaName;
 ALTER TABLE mortals_xhx_setup_project ADD COLUMN   `innerServerIpStatus` tinyint(2)    DEFAULT '0'  COMMENT '服务端内部ip更新状态' AFTER areaName;
 
+ALTER TABLE mortals_xhx_setup_project ADD COLUMN  `domain` varchar(255)      COMMENT '域名' AFTER areaName;
+ALTER TABLE mortals_xhx_setup_project ADD COLUMN   `domainStatus` tinyint(2)    DEFAULT '0'  COMMENT '域名更新状态' AFTER areaName;
 

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

@@ -102,6 +102,22 @@ public class CheckProjectStatusTaskImpl implements ITaskExcuteService {
                 }
             }
 
+            if (!ObjectUtils.isEmpty(setupProjectEntity.getDomain()) && setupProjectEntity.getProjectCode().equals(ProductDisEnum.排号系统PHP后端.getValue())) {
+                try {
+                    HashMap<String, Object> params = new HashMap<>();
+                    params.put("domain", setupProjectEntity.getDomain());
+                    //更新domain服务
+/*                   String resp = HttpUtil.get("http://127.0.0.1:11078/fm/param/updateServerIp", params);
+                    Rest rest = JSON.parseObject(resp, Rest.class);
+                    if (YesNoEnum.YES.getValue() == rest.getCode()) {
+                        setupProjectEntity.setDomainStatus(YesNoEnum.YES.getValue());
+                        setupProjectService.update(setupProjectEntity);
+                    }*/
+                } catch (Exception e) {
+                    log.info("更新排号项目服务ip失败");
+                }
+            }
+
         }
 
 

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/model/SetupProjectEntity.java

@@ -115,6 +115,14 @@ public class SetupProjectEntity extends SetupProjectVo {
      * 服务端内部ip更新状态
      */
     private Integer innerServerIpStatus;
+    /**
+     * 域名
+     */
+    private String domain;
+    /**
+     * 域名更新状态
+     */
+    private Integer domainStatus;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -156,5 +164,7 @@ public class SetupProjectEntity extends SetupProjectVo {
         this.clientToServerIpStatus = 0;
         this.innerServerIp = "";
         this.innerServerIpStatus = 0;
+        this.domain = "";
+        this.domainStatus = 0;
     }
 }
\ No newline at end of file

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/model/SetupProjectQuery.java

@@ -256,6 +256,26 @@ public class SetupProjectQuery extends SetupProjectEntity {
     /** 服务端内部ip更新状态排除列表 */
     private List <Integer> innerServerIpStatusNotList;
 
+    /** 域名 */
+    private List<String> domainList;
+
+    /** 域名排除列表 */
+    private List <String> domainNotList;
+    /** 开始 域名更新状态 */
+    private Integer domainStatusStart;
+
+    /** 结束 域名更新状态 */
+    private Integer domainStatusEnd;
+
+    /** 增加 域名更新状态 */
+    private Integer domainStatusIncrement;
+
+    /** 域名更新状态列表 */
+    private List <Integer> domainStatusList;
+
+    /** 域名更新状态排除列表 */
+    private List <Integer> domainStatusNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<SetupProjectQuery> orConditionList;
 
@@ -1697,6 +1717,119 @@ public class SetupProjectQuery extends SetupProjectEntity {
     }
 
 
+    /**
+     * 获取 域名
+     * @return domainList
+     */
+    public List<String> getDomainList(){
+        return this.domainList;
+    }
+
+    /**
+     * 设置 域名
+     * @param domainList
+     */
+    public void setDomainList(List<String> domainList){
+        this.domainList = domainList;
+    }
+
+    /**
+     * 获取 域名
+     * @return domainNotList
+     */
+    public List<String> getDomainNotList(){
+        return this.domainNotList;
+    }
+
+    /**
+     * 设置 域名
+     * @param domainNotList
+     */
+    public void setDomainNotList(List<String> domainNotList){
+        this.domainNotList = domainNotList;
+    }
+
+    /**
+     * 获取 开始 域名更新状态
+     * @return domainStatusStart
+     */
+    public Integer getDomainStatusStart(){
+        return this.domainStatusStart;
+    }
+
+    /**
+     * 设置 开始 域名更新状态
+     * @param domainStatusStart
+     */
+    public void setDomainStatusStart(Integer domainStatusStart){
+        this.domainStatusStart = domainStatusStart;
+    }
+
+    /**
+     * 获取 结束 域名更新状态
+     * @return $domainStatusEnd
+     */
+    public Integer getDomainStatusEnd(){
+        return this.domainStatusEnd;
+    }
+
+    /**
+     * 设置 结束 域名更新状态
+     * @param domainStatusEnd
+     */
+    public void setDomainStatusEnd(Integer domainStatusEnd){
+        this.domainStatusEnd = domainStatusEnd;
+    }
+
+    /**
+     * 获取 增加 域名更新状态
+     * @return domainStatusIncrement
+     */
+    public Integer getDomainStatusIncrement(){
+        return this.domainStatusIncrement;
+    }
+
+    /**
+     * 设置 增加 域名更新状态
+     * @param domainStatusIncrement
+     */
+    public void setDomainStatusIncrement(Integer domainStatusIncrement){
+        this.domainStatusIncrement = domainStatusIncrement;
+    }
+
+    /**
+     * 获取 域名更新状态
+     * @return domainStatusList
+     */
+    public List<Integer> getDomainStatusList(){
+        return this.domainStatusList;
+    }
+
+    /**
+     * 设置 域名更新状态
+     * @param domainStatusList
+     */
+    public void setDomainStatusList(List<Integer> domainStatusList){
+        this.domainStatusList = domainStatusList;
+    }
+
+    /**
+     * 获取 域名更新状态
+     * @return domainStatusNotList
+     */
+    public List<Integer> getDomainStatusNotList(){
+        return this.domainStatusNotList;
+    }
+
+    /**
+     * 设置 域名更新状态
+     * @param domainStatusNotList
+     */
+    public void setDomainStatusNotList(List<Integer> domainStatusNotList){
+        this.domainStatusNotList = domainStatusNotList;
+    }
+
+
     /**
      * 设置  ID,主键，自增长
      * @param id
@@ -2565,6 +2698,79 @@ public class SetupProjectQuery extends SetupProjectEntity {
         return this;
     }
 
+
+    /**
+     * 设置 域名
+     * @param domain
+     */
+    public SetupProjectQuery domain(String domain){
+        setDomain(domain);
+        return this;
+    }
+
+    /**
+     * 设置 域名
+     * @param domainList
+     */
+    public SetupProjectQuery domainList(List<String> domainList){
+        this.domainList = domainList;
+        return this;
+    }
+
+    /**
+     * 设置  域名更新状态
+     * @param domainStatus
+     */
+    public SetupProjectQuery domainStatus(Integer domainStatus){
+        setDomainStatus(domainStatus);
+        return this;
+    }
+
+    /**
+     * 设置 开始 域名更新状态
+     * @param domainStatusStart
+     */
+    public SetupProjectQuery domainStatusStart(Integer domainStatusStart){
+        this.domainStatusStart = domainStatusStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 域名更新状态
+     * @param domainStatusEnd
+     */
+    public SetupProjectQuery domainStatusEnd(Integer domainStatusEnd){
+        this.domainStatusEnd = domainStatusEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 域名更新状态
+     * @param domainStatusIncrement
+     */
+    public SetupProjectQuery domainStatusIncrement(Integer domainStatusIncrement){
+        this.domainStatusIncrement = domainStatusIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 域名更新状态
+     * @param domainStatusList
+     */
+    public SetupProjectQuery domainStatusList(List<Integer> domainStatusList){
+        this.domainStatusList = domainStatusList;
+        return this;
+    }
+
+    /**
+     * 设置 域名更新状态
+     * @param domainStatusNotList
+     */
+    public SetupProjectQuery domainStatusNotList(List<Integer> domainStatusNotList){
+        this.domainStatusNotList = domainStatusNotList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

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

@@ -202,7 +202,9 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se
         int code = VALUE_RESULT_SUCCESS;
 
         String clientToServerIp = setupProjectEntity.getClientToServerIp();
-        //String innerServerIp = setupProjectEntity.getInnerServerIp();
+        String innerServerIp = setupProjectEntity.getInnerServerIp();
+        String domain = setupProjectEntity.getDomain();
+
         try {
             boolean ipv4 = Validator.isIpv4(clientToServerIp);
             if (!ipv4) {
@@ -213,6 +215,10 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se
             if (!ObjectUtils.isEmpty(setupProjectBase)) {
                 setupProjectBase.setClientToServerIp(clientToServerIp);
                 setupProjectBase.setClientToServerIpStatus(YesNoEnum.NO.getValue());
+
+                setupProjectBase.setInnerServerIp(innerServerIp);
+                setupProjectBase.setInnerServerIpStatus(YesNoEnum.NO.getValue());
+
                 this.service.update(setupProjectBase);
             }
 
@@ -220,6 +226,9 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se
             if (!ObjectUtils.isEmpty(setupProjectDevice)) {
                 setupProjectDevice.setClientToServerIp(clientToServerIp);
                 setupProjectDevice.setClientToServerIpStatus(YesNoEnum.NO.getValue());
+
+                setupProjectDevice.setInnerServerIp(innerServerIp);
+                setupProjectDevice.setInnerServerIpStatus(YesNoEnum.NO.getValue());
                 this.service.update(setupProjectDevice);
             }
 
@@ -228,6 +237,12 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se
             if (!ObjectUtils.isEmpty(setupProjectPHP)) {
                 setupProjectPHP.setClientToServerIp(clientToServerIp);
                 setupProjectPHP.setClientToServerIpStatus(YesNoEnum.NO.getValue());
+
+                setupProjectPHP.setInnerServerIp(innerServerIp);
+                setupProjectPHP.setInnerServerIpStatus(YesNoEnum.NO.getValue());
+
+                setupProjectPHP.setDomain(domain);
+                setupProjectPHP.setDomainStatus(YesNoEnum.NO.getValue());
                 this.service.update(setupProjectPHP);
             }
 

setup-project-manager/src/test/java/httpclient/system.http

@@ -100,7 +100,7 @@ POST {{baseUrl}}/setup/project/serverIp/update
 Content-Type: application/json
 
 {
-  "clientToServerIp": "192.168.0.98"
+  "clientToServerIp": "192.168.0.250"
 }