增加添加站点对外接口

.idea/workspace.xml

@@ -5,16 +5,24 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ed63665b-8c5d-41ac-a75b-7a0cfc2d6ec5" name="Default Changelist" comment="增加添加站点对外接口">
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/param/UpdateSiteParam.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/OkkiSiteController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/OkkiSiteController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/ShopApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/ShopApiController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/entity/OkkiSite.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/entity/OkkiSite.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/param/ChangeSiteStatusParam.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/param/ChangeSiteStatusParam.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/IOkkiSiteService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/IOkkiSiteService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/impl/OkkiSiteServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/impl/OkkiSiteServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/site/OkkiSite.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/site/OkkiSite.data.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="CodeInsightWorkspaceSettings">
+    <option name="optimizeImportsOnTheFly" value="true" />
+  </component>
   <component name="ComposerSettings">
     <execution />
   </component>
@@ -52,6 +60,10 @@
   "keyToString": {
     "Application.AESUtils.executor": "Run",
     "Maven.jeecg-boot-parent [install].executor": "Run",
+    "Maven.jeecg-module-system [clean].executor": "Run",
+    "Maven.jeecg-module-system [install].executor": "Run",
+    "Maven.jeecg-system-biz [clean].executor": "Run",
+    "Maven.jeecg-system-biz [install].executor": "Run",
     "RequestMappingsPanelOrder0": "0",
     "RequestMappingsPanelOrder1": "1",
     "RequestMappingsPanelWidth0": "75",
@@ -60,7 +72,7 @@
     "Spring Boot.JeecgSystemApplication.executor": "Run",
     "git-widget-placeholder": "master",
     "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/workspace/jeecg-boot",
+    "last_opened_file_path": "D:/ProjectsCode/okki-oms/jeecgboot-vue3/src/views/okki/site",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.stylelint": "true",
     "node.js.detected.package.tslint": "true",
@@ -71,7 +83,7 @@
     "project.structure.last.edited": "Modules",
     "project.structure.proportion": "0.15",
     "project.structure.side.proportion": "0.2",
-    "settings.editor.selected.configurable": "MavenSettings",
+    "settings.editor.selected.configurable": "editor.preferences.import",
     "ts.external.directory.path": "D:\\ProjectsCode\\okki-oms\\jeecgboot-vue3\\node_modules\\typescript\\lib",
     "vue.rearranger.settings.migration": "true"
   }
@@ -81,8 +93,11 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\ProjectsCode\okki-oms\jeecg-boot\jeecg-module-system\jeecg-system-biz\src\main\java\org\jeecg\modules\api\okki\site" />
       <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\views\okki\site" />
+      <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\views\okki\site\components" />
+      <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\public\resource\img" />
+      <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\assets\images" />
+      <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\assets\loginmini\icon" />
     </key>
   </component>
   <component name="RunManager" selected="Spring Boot.JeecgSystemApplication">
@@ -135,8 +150,122 @@
       <workItem from="1714362445005" duration="1679000" />
       <workItem from="1714364142512" duration="1150000" />
       <workItem from="1714369560719" duration="12569000" />
-      <workItem from="1714438904130" duration="3306000" />
+      <workItem from="1714438904130" duration="33587000" />
+      <workItem from="1714957905106" duration="19768000" />
+    </task>
+    <task id="LOCAL-00001" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714450381296</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1714450381296</updated>
+    </task>
+    <task id="LOCAL-00002" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714450420866</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1714450420866</updated>
+    </task>
+    <task id="LOCAL-00003" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714457875069</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1714457875069</updated>
+    </task>
+    <task id="LOCAL-00004" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714458069584</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1714458069584</updated>
+    </task>
+    <task id="LOCAL-00005" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714458213029</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1714458213029</updated>
+    </task>
+    <task id="LOCAL-00006" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714459080017</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1714459080017</updated>
+    </task>
+    <task id="LOCAL-00007" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714460251682</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1714460251682</updated>
     </task>
+    <task id="LOCAL-00008" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714462542089</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1714462542089</updated>
+    </task>
+    <task id="LOCAL-00009" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714463041920</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1714463041920</updated>
+    </task>
+    <task id="LOCAL-00010" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714464347362</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1714464347362</updated>
+    </task>
+    <task id="LOCAL-00011" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714468263335</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1714468263335</updated>
+    </task>
+    <task id="LOCAL-00012" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714470635223</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1714470635223</updated>
+    </task>
+    <task id="LOCAL-00013" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714472058721</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1714472058721</updated>
+    </task>
+    <task id="LOCAL-00014" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714472389381</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1714472389381</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -157,4 +286,8 @@
     <MESSAGE value="增加添加站点对外接口" />
     <option name="LAST_COMMIT_MESSAGE" value="增加添加站点对外接口" />
   </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
 </project>

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/OkkiSiteController.java

@@ -17,20 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
 
 /**
  * @Description: 站点
@@ -45,10 +34,6 @@ import java.util.TreeMap;
 public class OkkiSiteController extends JeecgController<OkkiSite, IOkkiSiteService> {
 	@Autowired
 	private IOkkiSiteService okkiSiteService;
-
-	private final static String URL = "https://cms.dev.xiaoman.cn/shop-api/external/site";
-
-	private final static String CLIENT_SECRET = "";
 	
 	/**
 	 * 分页列表查询
@@ -175,115 +160,17 @@ public class OkkiSiteController extends JeecgController<OkkiSite, IOkkiSiteServi
     }
 
 	/**
-	 * 完成装修
+	 * 变更状态
 	 * @param okkiSite
 	 * @return
 	 */
 	@PostMapping(value = "/status")
-	public Result<String> changeStatus(@RequestBody OkkiSite okkiSite) throws Exception{
-		// TODO:: 请求okki平台接口
-		String url = "https://cms.dev.xiaoman.cn/shop-api/External/site";
-		String clientSecret = "rAqZAp9oo0crNariGVVpt5AvPeVhCKXJ";
-		Map<String, String> query = new TreeMap<>();
-		query.put("sign_method", "hmac-md5");
-		query.put("timestamp", String.valueOf(System.currentTimeMillis()));
-		query.put("site_id", String.valueOf(okkiSite.getSite_id()));
-		query.put("method", "update_site_status");
-
-		Map<String, Object> postData = new HashMap<>();
-		postData.put("status", 3);
-
-		String queryStr = buildQueryString(query);
-		String body = toJsonString(postData);
-		String signStr = queryStr + body;
-		query.put("signature", generateHmacMD5(signStr, clientSecret));
-
-		String okkiUrl = url + "?" + buildQueryString(query);
-		String res = doPost(okkiUrl, body);
-		log.info(res);
-		if (!res.isEmpty()) {
-			okkiSite.setStatus(3);
-			okkiSiteService.updateById(okkiSite);
+	public Result<String> changeStatus(@RequestBody OkkiSite okkiSite) throws Exception {
+		boolean result = okkiSiteService.changeStatus(okkiSite);
+		if (result) {
 			return Result.OK("操作成功");
 		}else {
 			return Result.error("操作失败");
 		}
 	}
-
-
-//	public static void main(String[] args) throws Exception {
-//		String url = "https://cms.dev.xiaoman.cn/shop-api/External/site";
-//		String clientSecret = "rAqZAp9oo0crNariGVVpt5AvPeVhCKXJ";
-//		Map<String, String> query = new TreeMap<>();
-//		query.put("sign_method", "hmac-md5");
-//		query.put("timestamp", String.valueOf(System.currentTimeMillis()));
-//		query.put("site_id", "1000002");
-//		query.put("method", "update_site_status");
-//
-//		Map<String, Object> postData = new HashMap<>();
-//		postData.put("status", 3);
-//
-//		String queryStr = buildQueryString(query);
-//		String body = toJsonString(postData);
-//		String signStr = queryStr + body;
-//		query.put("signature", generateHmacMD5(signStr, clientSecret));
-//
-//		String okkiUrl = url + "?" + buildQueryString(query);
-//		String res = doPost(okkiUrl, body);
-//		System.out.println(res);
-//	}
-
-	private static String buildQueryString(Map<String, String> params) {
-		StringBuilder query = new StringBuilder();
-		for (Map.Entry<String, String> entry : params.entrySet()) {
-			if (query.length() > 0) {
-				query.append("&");
-			}
-			query.append(entry.getKey()).append("=").append(entry.getValue());
-		}
-		return query.toString();
-	}
-
-	private static String generateHmacMD5(String data, String secret) throws Exception {
-		SecretKeySpec keySpec = new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), "HmacMD5");
-		Mac mac = Mac.getInstance("HmacMD5");
-		mac.init(keySpec);
-		byte[] hmacBytes = mac.doFinal(data.getBytes(StandardCharsets.UTF_8));
-		StringBuilder sb = new StringBuilder(hmacBytes.length * 2);
-		for (byte b : hmacBytes) {
-			sb.append(String.format("%02x", b));
-		}
-		return sb.toString();
-	}
-
-	private static String toJsonString(Object object) throws Exception {
-		com.google.gson.Gson gson = new com.google.gson.Gson();
-		return gson.toJson(object);
-	}
-
-	private static String doPost(String url, String data) throws Exception {
-		java.net.URL apiUrl = new URL(url);
-		System.out.println(url);
-		HttpURLConnection connection = (HttpURLConnection) apiUrl.openConnection();
-		connection.setRequestMethod("POST");
-		connection.setRequestProperty("Content-Type", "application/json");
-		connection.setDoOutput(true);
-		try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
-			outputStream.write(data.getBytes(StandardCharsets.UTF_8));
-			outputStream.flush();
-		}
-
-		int responseCode = connection.getResponseCode();
-		if (responseCode == HttpURLConnection.HTTP_OK) {
-			try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
-				String line;
-				StringBuilder response = new StringBuilder();
-				while ((line = in.readLine()) != null) {
-					response.append(line);
-				}
-				return response.toString();
-			}
-		}
-		throw new Exception("HTTP request failed with response code: " + responseCode);
-	}
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/ShopApiController.java

@@ -4,12 +4,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpHeaders;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.okki.site.entity.OkkiSite;
+import org.jeecg.modules.api.okki.site.param.ChangeSiteStatusParam;
 import org.jeecg.modules.api.okki.site.service.IOkkiSiteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 /**
  * @Description: 站点
- * @Author: jeecg-boot
+ * @Author: Jack
  * @Date:   2024-04-29
  * @Version: V1.0
  */
@@ -32,4 +33,36 @@ public class ShopApiController {
         log.info("请求成功，返回结果" + save);
         return Result.OK("添加成功！");
     }
+
+    @PostMapping(value = "/edit")
+    public Result<String> edit(@RequestBody OkkiSite okkiSite, @RequestHeader(HttpHeaders.AUTHORIZATION) String authorization) {
+        log.info("请求参数 param" + okkiSite.toString() + "authorization" + authorization);
+        String Authorization = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImRlYW4iLCJleHAiOjE3MTQ0NjU5Njl9.QdCBYR8mioXcKGi1n5RdMQ5RbJHCSGbE8dkdwYuOXh4";
+        if (!authorization.equals(Authorization)) {
+            return Result.error("sign 验证不通过");
+        }
+        boolean result = okkiSiteService.updateBySiteId(okkiSite);
+        log.info("请求成功，返回结果" + result);
+        if (result == true) {
+            return Result.OK("编辑成功！");
+        }else {
+            return Result.error("编辑失败！");
+        }
+    }
+
+    @PostMapping(value = "/changeStatus")
+    public Result<String> changeStatus(@RequestBody ChangeSiteStatusParam param, @RequestHeader(HttpHeaders.AUTHORIZATION) String authorization) {
+        log.info("请求参数 param" + param.toString() + ",authorization" + authorization);
+        String Authorization = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImRlYW4iLCJleHAiOjE3MTQ0NjU5Njl9.QdCBYR8mioXcKGi1n5RdMQ5RbJHCSGbE8dkdwYuOXh4";
+        if (!authorization.equals(Authorization)) {
+            return Result.error("sign 验证不通过");
+        }
+        boolean result = okkiSiteService.okkiChangeStatus(param);
+        log.info("请求成功，返回结果" + result);
+        if (result == true) {
+            return Result.OK("编辑成功！");
+        }else {
+            return Result.error("编辑失败！");
+        }
+    }
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/entity/OkkiSite.java

@@ -1,8 +1,6 @@
 package org.jeecg.modules.api.okki.site.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -57,34 +55,42 @@ public class OkkiSite implements Serializable {
 	/**公司名称*/
 	@Excel(name = "公司名称", width = 15)
     @ApiModelProperty(value = "公司名称")
-    private String company_name;
+    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+    private String company_name = "";
 	/**初始化的域名*/
 	@Excel(name = "初始化的域名", width = 15)
     @ApiModelProperty(value = "初始化的域名")
-    private String domain;
+    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+    private String domain = "";
 	/**联系方式*/
 	@Excel(name = "联系方式", width = 15)
     @ApiModelProperty(value = "联系方式")
-    private String tel;
+    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+    private String tel = "";
 	/**联系人*/
 	@Excel(name = "联系人", width = 15)
     @ApiModelProperty(value = "联系人")
-    private String contact;
+    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+    private String contact = "";
 	/**邮箱*/
 	@Excel(name = "邮箱", width = 15)
     @ApiModelProperty(value = "邮箱")
+    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
     private String email = "";
 	/**公司名英⽂简称*/
 	@Excel(name = "公司名英⽂简称", width = 15)
     @ApiModelProperty(value = "公司名英⽂简称")
+    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
     private String enname = "";
 	/**套餐名*/
 	@Excel(name = "套餐名", width = 15)
     @ApiModelProperty(value = "套餐名")
+    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
     private String tc_name = "OKKI Shops Smart(2023)";
 	/**套餐周期，单位⽉*/
 	@Excel(name = "套餐周期，单位⽉", width = 15)
     @ApiModelProperty(value = "套餐周期，单位⽉")
+    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
     private Integer tc_period = 12;
 	/**站点选择的⼩语种语⾔*/
 	@Excel(name = "站点选择的⼩语种语⾔", width = 15)
@@ -93,10 +99,12 @@ public class OkkiSite implements Serializable {
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
+    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
     private String remark = "";
     /**状态*/
     @Excel(name = "状态", width = 15, dicCode = "site_status")
     @Dict(dicCode = "site_status")
     @ApiModelProperty(value = "状态")
-    private java.lang.Integer status = 0;
+    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+    private Integer status = 0;
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/param/ChangeSiteStatusParam.java

@@ -5,5 +5,7 @@ import lombok.Data;
 @Data
 public class ChangeSiteStatusParam {
 
+    private Integer site_id;
+
     private Integer status;
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/param/UpdateSiteParam.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.api.okki.site.param;
+
+public class UpdateSiteParam extends BaseParam{
+
+    private Integer site_id;
+
+    private String company_name = "";
+
+    private String domain = "";
+
+    private String tel = "";
+
+    private String contact = "";
+
+    private String email = "";
+
+    private String enname = "";
+
+    private String tc_name = "";
+
+    private String tc_period = "";
+
+    private String tc_language = "";
+
+    private String remark = "";
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/IOkkiSiteService.java

@@ -1,7 +1,8 @@
 package org.jeecg.modules.api.okki.site.service;
 
-import org.jeecg.modules.api.okki.site.entity.OkkiSite;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.api.okki.site.entity.OkkiSite;
+import org.jeecg.modules.api.okki.site.param.ChangeSiteStatusParam;
 
 /**
  * @Description: 站点
@@ -11,4 +12,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IOkkiSiteService extends IService<OkkiSite> {
 
+    boolean updateBySiteId(OkkiSite okkiSite);
+
+    boolean changeStatus(OkkiSite okkiSite);
+
+    boolean okkiChangeStatus(ChangeSiteStatusParam param);
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/impl/OkkiSiteServiceImpl.java

@@ -1,11 +1,27 @@
 package org.jeecg.modules.api.okki.site.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.api.okki.site.entity.OkkiSite;
 import org.jeecg.modules.api.okki.site.mapper.OkkiSiteMapper;
+import org.jeecg.modules.api.okki.site.param.ChangeSiteStatusParam;
 import org.jeecg.modules.api.okki.site.service.IOkkiSiteService;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import javax.annotation.Resource;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * @Description: 站点
@@ -13,7 +29,143 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Date:   2024-04-29
  * @Version: V1.0
  */
+@Slf4j
 @Service
 public class OkkiSiteServiceImpl extends ServiceImpl<OkkiSiteMapper, OkkiSite> implements IOkkiSiteService {
 
+    private final static String URL = "https://cms.dev.xiaoman.cn/shop-api/External/site";
+
+    private final static String CLIENT_SECRET = "rAqZAp9oo0crNariGVVpt5AvPeVhCKXJ";
+
+    @Resource
+    private OkkiSiteMapper okkiSiteMapper;
+
+    @Override
+    public boolean updateBySiteId(OkkiSite okkiSite) {
+        QueryWrapper<OkkiSite> okkiSiteQueryWrapper = new QueryWrapper<>();
+        okkiSiteQueryWrapper.eq("site_id", okkiSite.getSite_id());
+        okkiSiteQueryWrapper.last("limit 1");
+        OkkiSite okkiSite1 = okkiSiteMapper.selectOne(okkiSiteQueryWrapper);
+        okkiSite.setId(okkiSite1.getId());
+        int result = okkiSiteMapper.updateById(okkiSite);
+        if (result == 0) {
+            return false;
+        }else {
+            return true;
+        }
+    }
+
+    @Override
+    public boolean changeStatus(OkkiSite okkiSite) {
+        // 请求okki平台接口
+        Map<String, String> query = new TreeMap<>();
+        query.put("sign_method", "hmac-md5");
+        query.put("timestamp", String.valueOf(System.currentTimeMillis()));
+        query.put("site_id", String.valueOf(okkiSite.getSite_id()));
+        query.put("method", "update_service_node");
+        // 通过site_id获取当前站点数据status的值 +1
+        QueryWrapper<OkkiSite> okkiSiteQueryWrapper = new QueryWrapper<>();
+        okkiSiteQueryWrapper.eq("site_id", okkiSite.getSite_id());
+        okkiSiteQueryWrapper.last("limit 1");
+        OkkiSite okkiSite1 = okkiSiteMapper.selectOne(okkiSiteQueryWrapper);
+        okkiSite.setId(okkiSite1.getId());
+        okkiSite.setStatus(okkiSite1.getStatus()+1);
+        Map<String, Object> postData = new HashMap<>();
+        postData.put("status", okkiSite1.getStatus()+1);
+        try {
+            String queryStr = buildQueryString(query);
+            String body = toJsonString(postData);
+            String signStr = queryStr + body;
+            query.put("signature", generateHmacMD5(signStr, CLIENT_SECRET));
+            String okkiUrl = URL + "?" + buildQueryString(query);
+            log.info("url:" + okkiUrl + ",body:" + body);
+            String res = doPost(okkiUrl, body);
+            log.info(res);
+            // {"code":0,"msg":"success","now":"2024-05-06 15:34:54","data":[]}
+            JSONObject jsonObject= JSONObject.parseObject(res);
+            if (jsonObject.get("code").equals(0)) {
+                int result = okkiSiteMapper.updateById(okkiSite);
+                if (result == 0) {
+                    return false;
+                }else {
+                    return true;
+                }
+            }else {
+                return false;
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public boolean okkiChangeStatus(ChangeSiteStatusParam param) {
+        OkkiSite okkiSite = new OkkiSite();
+        QueryWrapper<OkkiSite> okkiSiteQueryWrapper = new QueryWrapper<>();
+        okkiSiteQueryWrapper.eq("site_id", param.getSite_id());
+        okkiSiteQueryWrapper.last("limit 1");
+        OkkiSite okkiSite1 = okkiSiteMapper.selectOne(okkiSiteQueryWrapper);
+        okkiSite.setId(okkiSite1.getId());
+        okkiSite.setStatus(param.getStatus());
+        int result = okkiSiteMapper.updateById(okkiSite);
+        if (result == 0) {
+            return false;
+        }else {
+            return true;
+        }
+    }
+
+    private static String buildQueryString(Map<String, String> params) {
+        StringBuilder query = new StringBuilder();
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            if (query.length() > 0) {
+                query.append("&");
+            }
+            query.append(entry.getKey()).append("=").append(entry.getValue());
+        }
+        return query.toString();
+    }
+
+    private static String generateHmacMD5(String data, String secret) throws Exception {
+        SecretKeySpec keySpec = new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), "HmacMD5");
+        Mac mac = Mac.getInstance("HmacMD5");
+        mac.init(keySpec);
+        byte[] hmacBytes = mac.doFinal(data.getBytes(StandardCharsets.UTF_8));
+        StringBuilder sb = new StringBuilder(hmacBytes.length * 2);
+        for (byte b : hmacBytes) {
+            sb.append(String.format("%02x", b));
+        }
+        return sb.toString();
+    }
+
+    private static String toJsonString(Object object) throws Exception {
+        com.google.gson.Gson gson = new com.google.gson.Gson();
+        return gson.toJson(object);
+    }
+
+    private static String doPost(String url, String data) throws Exception {
+        java.net.URL apiUrl = new URL(url);
+        System.out.println(url);
+        HttpURLConnection connection = (HttpURLConnection) apiUrl.openConnection();
+        connection.setRequestMethod("POST");
+        connection.setRequestProperty("Content-Type", "application/json");
+        connection.setDoOutput(true);
+        try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
+            outputStream.write(data.getBytes(StandardCharsets.UTF_8));
+            outputStream.flush();
+        }
+
+        int responseCode = connection.getResponseCode();
+        if (responseCode == HttpURLConnection.HTTP_OK) {
+            try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+                String line;
+                StringBuilder response = new StringBuilder();
+                while ((line = in.readLine()) != null) {
+                    response.append(line);
+                }
+                return response.toString();
+            }
+        }
+        throw new Exception("HTTP request failed with response code: " + responseCode);
+    }
 }

jeecgboot-vue3/src/views/okki/site/OkkiSite.data.ts

@@ -5,6 +5,11 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
    {
+    title: '站点id',
+    align:"center",
+    dataIndex: 'siteId'
+   },
+   {
     title: '公司名称',
     align:"center",
     dataIndex: 'companyName'
@@ -54,6 +59,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'remark'
    },
+   {
+    title: '状态',
+    align:"center",
+    dataIndex: 'status_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -61,6 +71,11 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
+    label: '站点id',
+    field: 'siteId',
+    component: 'InputNumber',
+  },
+  {
     label: '公司名称',
     field: 'companyName',
     component: 'Input',
@@ -108,7 +123,15 @@ export const formSchema: FormSchema[] = [
   {
     label: '备注',
     field: 'remark',
-    component: 'Input',
+    component: 'InputTextArea',
+  },
+  {
+    label: '状态',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"site_status"
+     },
   },
 	// TODO 主键隐藏字段，目前写死为ID
 	{
@@ -121,16 +144,18 @@ export const formSchema: FormSchema[] = [
 
 // 高级查询数据
 export const superQuerySchema = {
-  companyName: {title: '公司名称',order: 0,view: 'text', type: 'string',},
-  domain: {title: '初始化的域名',order: 1,view: 'text', type: 'string',},
-  tel: {title: '联系方式',order: 2,view: 'text', type: 'string',},
-  contact: {title: '联系人',order: 3,view: 'text', type: 'string',},
-  email: {title: '邮箱',order: 4,view: 'text', type: 'string',},
-  enname: {title: '公司名英⽂简称',order: 5,view: 'text', type: 'string',},
-  tcName: {title: '套餐名',order: 6,view: 'text', type: 'string',},
-  tcPeriod: {title: '套餐周期，单位⽉',order: 7,view: 'number', type: 'number',},
-  tcLanguage: {title: '站点选择的⼩语种语⾔',order: 8,view: 'text', type: 'string',},
-  remark: {title: '备注',order: 9,view: 'text', type: 'string',},
+  siteId: {title: '站点id',order: 0,view: 'number', type: 'number',},
+  companyName: {title: '公司名称',order: 1,view: 'text', type: 'string',},
+  domain: {title: '初始化的域名',order: 2,view: 'text', type: 'string',},
+  tel: {title: '联系方式',order: 3,view: 'text', type: 'string',},
+  contact: {title: '联系人',order: 4,view: 'text', type: 'string',},
+  email: {title: '邮箱',order: 5,view: 'text', type: 'string',},
+  enname: {title: '公司名英⽂简称',order: 6,view: 'text', type: 'string',},
+  tcName: {title: '套餐名',order: 7,view: 'text', type: 'string',},
+  tcPeriod: {title: '套餐周期，单位⽉',order: 8,view: 'number', type: 'number',},
+  tcLanguage: {title: '站点选择的⼩语种语⾔',order: 9,view: 'text', type: 'string',},
+  remark: {title: '备注',order: 10,view: 'textarea', type: 'string',},
+  status: {title: '状态',order: 11,view: 'number', type: 'number',},
 };
 
 /**