协议管理增加协议类型字段

sst-manager/db/add_db.sql

@@ -277,3 +277,8 @@ CREATE TABLE `mortals_xhx_converge_apps_access` (
 
 ALTER TABLE `mortals_xhx_sst_apps_desk` ADD COLUMN `clickSum` int(8) DEFAULT '0' COMMENT '应用点击次数';
 ALTER TABLE `mortals_xhx_sst_apps` ADD COLUMN `clickSum` int(8) DEFAULT '0' COMMENT '应用点击次数';
+
+ALTER TABLE `mortals_xhx_sst_agreement` ADD COLUMN `protocolType` tinyint(2)  DEFAULT '1'  COMMENT '协议类型' AFTER `name`;
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('协议类型', 'SstAgreement', 'protocolType', '1', '注册协议', '1', '4', '0', NULL, NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('协议类型', 'SstAgreement', 'protocolType', '2', '申报协议', '1', '4', '0', NULL, NULL, NULL, NULL);
+

sst-manager/src/main/java/com/mortals/xhx/module/sst/model/SstAgreementEntity.java

 package com.mortals.xhx.module.sst.model;
-
 import java.util.List;
 import java.util.ArrayList;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.sst.model.vo.SstAgreementVo;
+import lombok.Data;
 /**
-* 协议管理实体对象
-*
-* @author zxfei
-* @date 2022-12-26
-*/
-
+ * 协议管理实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-10
+ */
+@Data
 public class SstAgreementEntity extends SstAgreementVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 站点id
-    */
+     * 站点id
+     */
     private Long siteId;
     /**
-    * 协议名称
-    */
+     * 协议名称
+     */
     private String name;
     /**
-    * 协议描述
-    */
+     * 协议描述
+     */
     private String describe;
     /**
-    * 协议内容
-    */
+     * 协议内容
+     */
     private String content;
-
-
-
-    public SstAgreementEntity(){}
-    /**
-    * 获取 站点id
-    * @return Long
-    */
-    public Long getSiteId(){
-        return siteId;
-    }
     /**
-    * 设置 站点id
-    * @param siteId
-    */
-    public void setSiteId(Long siteId){
-        this.siteId = siteId;
-    }
-    /**
-    * 获取 协议名称
-    * @return String
-    */
-    public String getName(){
-        return name;
-    }
-    /**
-    * 设置 协议名称
-    * @param name
-    */
-    public void setName(String name){
-        this.name = name;
-    }
-    /**
-    * 获取 协议描述
-    * @return String
-    */
-    public String getDescribe(){
-        return describe;
-    }
-    /**
-    * 设置 协议描述
-    * @param describe
-    */
-    public void setDescribe(String describe){
-        this.describe = describe;
-    }
-    /**
-    * 获取 协议内容
-    * @return String
-    */
-    public String getContent(){
-        return content;
-    }
-    /**
-    * 设置 协议内容
-    * @param content
-    */
-    public void setContent(String content){
-        this.content = content;
-    }
-
-
-
-
+     * 协议类型
+     */
+    private Integer protocolType;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -106,29 +46,22 @@ public class SstAgreementEntity extends SstAgreementVo {
         if (obj instanceof SstAgreementEntity) {
             SstAgreementEntity tmp = (SstAgreementEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",siteId:").append(getSiteId());
-        sb.append(",name:").append(getName());
-        sb.append(",describe:").append(getDescribe());
-        sb.append(",content:").append(getContent());
-        return sb.toString();
-    }
-
     public void initAttrValue(){
 
-            this.siteId = null;
+        this.siteId = -1L;
+
+        this.name = "";
 
-            this.name = "";
+        this.describe = "";
 
-            this.describe = "";
+        this.content = "";
 
-            this.content = "";
+        this.protocolType = 1;
     }
 }
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/sst/web/SstAgreementController.java

@@ -42,6 +42,7 @@ public class SstAgreementController extends BaseCRUDJsonBodyMappingController<Ss
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "protocolType", paramService.getParamBySecondOrganize("SstAgreement","protocolType"));
         super.init(model, context);
     }
 

sst-manager/src/main/java/com/mortals/xhx/module/sst/web/SstBasicController.java

@@ -240,8 +240,8 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
                 rootNode.setType("area");
                 rootNode.setIcon("el-icon-folder");
                 rootNode.setIsLeaf(false);
-                rootNode.setLatitude("30.595081");
-                rootNode.setLongitude("104.062983");
+                rootNode.setLatitude("28.732286");
+                rootNode.setLongitude("104.623552");
                 rootNode.setSiteCount(getChildrenCount(resultList,2,siteMap,siteDeviceMap)-1);
                 rootNode.setChildren(resultList);
                 rootNode.setLevel(1);