Ver Fonte

20240513_sun

15143018065 há 11 meses atrás
pai
commit
6a84862967

+ 5 - 5
ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/controller/LnstSbxxController.java

@@ -83,7 +83,7 @@ public class LnstSbxxController extends BaseController
     }
 
     @PostMapping("/add")
-    public AjaxResult in(String json) {
+    public AjaxResult addByQr(String json) {
         SM4Utils sm4 = new SM4Utils();
         sm4.secretKey = "d8f37edaf81f4373";
         String jsonStr = sm4.decryptData_ECB(json);
@@ -103,7 +103,7 @@ public class LnstSbxxController extends BaseController
      */
     @RequiresPermissions("lnst:sbxx:edit")
     @Log(title = "老年食堂app版本号信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody LnstSbxx lnstSbxx)
     {
         return toAjax(lnstSbxxService.updateLnstSbxx(lnstSbxx));
@@ -114,9 +114,9 @@ public class LnstSbxxController extends BaseController
      */
     @RequiresPermissions("lnst:sbxx:remove")
     @Log(title = "老年食堂app版本号信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
+	@GetMapping("/remove")
+    public AjaxResult remove(LnstSbxx lnstSbxx)
     {
-        return toAjax(lnstSbxxService.deleteLnstSbxxByIds(ids));
+        return toAjax(lnstSbxxService.deleteLnstSbxxById(lnstSbxx.getId()));
     }
 }

+ 10 - 9
ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/ILnstSbxxService.java

@@ -1,19 +1,20 @@
 package com.ruoyi.lnst.service;
 
-import java.util.List;
 import com.ruoyi.lnst.domain.LnstSbxx;
 
+import java.util.List;
+
 /**
  * 老年食堂app版本号信息Service接口
- * 
+ *
  * @author sun
  * @date 2024-05-13
  */
-public interface ILnstSbxxService 
+public interface ILnstSbxxService
 {
     /**
      * 查询老年食堂app版本号信息
-     * 
+     *
      * @param id 老年食堂app版本号信息主键
      * @return 老年食堂app版本号信息
      */
@@ -21,7 +22,7 @@ public interface ILnstSbxxService
 
     /**
      * 查询老年食堂app版本号信息列表
-     * 
+     *
      * @param lnstSbxx 老年食堂app版本号信息
      * @return 老年食堂app版本号信息集合
      */
@@ -29,7 +30,7 @@ public interface ILnstSbxxService
 
     /**
      * 新增老年食堂app版本号信息
-     * 
+     *
      * @param lnstSbxx 老年食堂app版本号信息
      * @return 结果
      */
@@ -37,7 +38,7 @@ public interface ILnstSbxxService
 
     /**
      * 修改老年食堂app版本号信息
-     * 
+     *
      * @param lnstSbxx 老年食堂app版本号信息
      * @return 结果
      */
@@ -45,10 +46,10 @@ public interface ILnstSbxxService
 
     /**
      * 批量删除老年食堂app版本号信息
-     * 
+     *
      * @param ids 需要删除的老年食堂app版本号信息主键集合
      * @return 结果
      */
-    public int deleteLnstSbxxByIds(String[] ids);
+    public int deleteLnstSbxxById(String id);
 
 }

+ 3 - 4
ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/LnstSbxxServiceImpl.java

@@ -10,7 +10,6 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -81,13 +80,13 @@ public class LnstSbxxServiceImpl implements ILnstSbxxService
     /**
      * 批量删除老年食堂app版本号信息
      *
-     * @param ids 需要删除的老年食堂app版本号信息主键
+     * @param id 需要删除的老年食堂app版本号信息主键
      * @return 结果
      */
     @Override
-    public int deleteLnstSbxxByIds(String[] ids)
+    public int deleteLnstSbxxById(String id)
     {
-        return lnstSbxxMapper.deleteBatchIds(Arrays.asList(ids));
+        return lnstSbxxMapper.deleteById(id);
     }
 
 }

+ 14 - 6
ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/YlServer.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.lnst.domain.InLnstLrxx;
+import com.ruoyi.system.sm4.SM4Utils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.bouncycastle.crypto.digests.SM3Digest;
 import org.bouncycastle.util.encoders.Hex;
@@ -35,6 +36,13 @@ public class YlServer {
     protected final Logger logger = LoggerFactory.getLogger(YlServer.class);
 
     public static void main(String[] args) {
+
+        JSONObject object = new JSONObject();
+        object.put("sysid", "68cd661250796472");
+        SM4Utils sm4 = new SM4Utils();
+        sm4.secretKey = "d8f37edaf81f4373";
+        String jsonStr = sm4.encryptData_ECB(object.toJSONString());
+        System.out.println(jsonStr);
         // 禁用/启用
 //        TreeMap<String, Object> lr = new TreeMap<>();
 //        lr.put("memberCode", "1100302290");
@@ -60,12 +68,12 @@ public class YlServer {
 //        }
 //        System.out.println( YlServer.httpsRequest(YlServer.Map2JSONStr(map)));
 
-        TreeMap<String, Object> store = new TreeMap<>();
-        store.put("storeCode", "0003");
-        store.put("state", "1");
-        TreeMap<String, Object> map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.mdzt"), "10002253",
-                null, store);
-        System.out.println(YlServer.httpsRequest(YlServer.Map2JSONStr(map)));
+//        TreeMap<String, Object> store = new TreeMap<>();
+//        store.put("storeCode", "0003");
+//        store.put("state", "1");
+//        TreeMap<String, Object> map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.mdzt"), "10002253",
+//                null, store);
+//        System.out.println(YlServer.httpsRequest(YlServer.Map2JSONStr(map)));
 
 //        TreeMap<String, Object> lr = new TreeMap<>();
 //        lr.put("storeCode", "");

+ 5 - 4
ruoyi-ui/src/api/lnst/sbxx.js

@@ -29,8 +29,8 @@ export function addSbxx(data) {
 // 修改老年食堂app版本号信息
 export function updateSbxx(data) {
   return request({
-    url: '/lnst/sbxx',
-    method: 'put',
+    url: '/lnst/sbxx/edit',
+    method: 'post',
     data: data
   })
 }
@@ -38,7 +38,8 @@ export function updateSbxx(data) {
 // 删除老年食堂app版本号信息
 export function delSbxx(id) {
   return request({
-    url: '/lnst/sbxx/' + id,
-    method: 'delete'
+    url: '/lnst/sbxx/remove',
+    method: 'get',
+    params: { id: id }
   })
 }