secret表信息

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/SecretSettingDTO.java

@@ -69,6 +69,30 @@ public class SecretSettingDTO implements Serializable {
      *
      */
     private Date updateTime;
+    /**
+     * 应用id
+     */
+    private String agentId;
+    /**
+     * 应用名称
+     */
+    private String agentName;
+
+    public String getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(String agentId) {
+        this.agentId = agentId;
+    }
+
+    public String getAgentName() {
+        return agentName;
+    }
+
+    public void setAgentName(String agentName) {
+        this.agentName = agentName;
+    }
 
     public String getSecretId() {
         return secretId;

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java

@@ -114,6 +114,42 @@ public class WxEnterpriseDTO implements Serializable {
      * 应用类型，0第三方 1自建
      */
     private Integer appType;
+    /**
+     * 应用id
+     */
+    private String agentId;
+    /**
+     * 应用名称
+     */
+    private String agentName;
+    /**
+     * secret
+     */
+    private String secretVal;
+
+    public String getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(String agentId) {
+        this.agentId = agentId;
+    }
+
+    public String getAgentName() {
+        return agentName;
+    }
+
+    public void setAgentName(String agentName) {
+        this.agentName = agentName;
+    }
+
+    public String getSecretVal() {
+        return secretVal;
+    }
+
+    public void setSecretVal(String secretVal) {
+        this.secretVal = secretVal;
+    }
 
     public Integer getAppType() {
         return appType;

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/qo/WxEnterpriseQO.java

@@ -16,13 +16,17 @@ public class WxEnterpriseQO implements Serializable {
      */
     private String corpSquareLogoUrl;
     /**
+     * 应用id
+     */
+    private String agentId;
+    /**
      * 应用名称
      */
-    private String name;
+    private String agentName;
     /**
-     * wx的秘钥
+     * secret
      */
-    private String wxSecretKey;
+    private String secretVal;
     /**
      * 明文corpid
      */
@@ -64,22 +68,6 @@ public class WxEnterpriseQO implements Serializable {
         this.corpSquareLogoUrl = corpSquareLogoUrl;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getWxSecretKey() {
-        return wxSecretKey;
-    }
-
-    public void setWxSecretKey(String wxSecretKey) {
-        this.wxSecretKey = wxSecretKey;
-    }
-
     public String getWxCorpid() {
         return wxCorpid;
     }
@@ -111,4 +99,28 @@ public class WxEnterpriseQO implements Serializable {
     public void setAppType(Integer appType) {
         this.appType = appType;
     }
+
+    public String getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(String agentId) {
+        this.agentId = agentId;
+    }
+
+    public String getAgentName() {
+        return agentName;
+    }
+
+    public void setAgentName(String agentName) {
+        this.agentName = agentName;
+    }
+
+    public String getSecretVal() {
+        return secretVal;
+    }
+
+    public void setSecretVal(String secretVal) {
+        this.secretVal = secretVal;
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java

@@ -255,6 +255,13 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     public WxEnterpriseDTO getOne(String wxEnterpriseId) {
         TabHaobanWxEnterprise tab = wxEnterpriseMapper.selectByPrimaryKey(wxEnterpriseId);
         WxEnterpriseDTO wxDTO = EntityUtil.changeEntityByJSON(WxEnterpriseDTO.class, tab);
+        //查询secret表信息
+        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.SELF_APP.getVal());
+        if (null != secretSetting){
+            wxDTO.setAgentId(secretSetting.getAgentId());
+            wxDTO.setAgentName(secretSetting.getAgentName());
+            wxDTO.setSecretVal(secretSetting.getSecretVal());
+        }
         return wxDTO;
     }
     
@@ -537,9 +544,19 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
             //默认是自建应用
             enterpriseDTO.setWxSecurityType(5);
             String wxEnterpriseId = wxEnterpriseService.add(enterpriseDTO);
-            //同步更新
+            //同步新增
             Date now = new Date();
             haobanWxEnterpriseApiService.saveOrUpdate(wxEnterpriseId,enterpriseDTO.getCorpName(),enterpriseDTO.getCorpSquareLogoUrl(),1,now,now);
+            //新增secret表
+            SecretSettingDTO dto = new SecretSettingDTO();
+            dto.setWxEnterpriseId(wxEnterpriseId);
+            dto.setEnterpriseId("-1");
+            dto.setSecretName("好办自建应用");
+            dto.setSecretType(1);
+            dto.setSecretVal(enterpriseDTO.getSecretVal());
+            dto.setAgentId(enterpriseDTO.getAgentId());
+            dto.setAgentName(enterpriseDTO.getAgentName());
+            secretSettingService.saveSecretSetting(dto);
             //好办权限初始化
             log.info("插入好办小程序权限：{}",wxEnterpriseId);
             haobanRoleApiService.addHaobanRole(wxEnterpriseId);
@@ -548,6 +565,17 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
                 return ServiceResponse.failure("-9999","自建小程序的appid存在重复！");
             }
             wxEnterpriseService.update(enterpriseDTO);
+            String wxEnterpriseId = enterpriseDTO.getWxEnterpriseId();
+            SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.SELF_APP.getVal());
+            if (null != secretSetting){
+                //更新secret表
+                if (!secretSetting.getAgentName().equals(enterpriseDTO.getAgentName())){
+                    SecretSettingDTO dto = new SecretSettingDTO();
+                    dto.setSecretId(secretSetting.getSecretId());
+                    dto.setAgentName(enterpriseDTO.getAgentName());
+                    secretSettingService.saveSecretSetting(dto);
+                }
+            }
         }
         return ServiceResponse.success(true);
     }