From 9c98d630866b80627ae21ca539a8c3776baa7e73 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 09 十二月 2024 10:10:35 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/StaDescController.java |   74 +++++++++++++++++++++++++++++++-----
 1 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 4c20032..ec62e28 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.zy.asrs.entity.StaDesc;
+import com.zy.asrs.entity.param.StaDescInitParam;
 import com.zy.asrs.service.StaDescService;
 import com.zy.common.web.BaseController;
 import com.core.annotations.ManagerAuth;
@@ -24,6 +25,48 @@
     @Autowired
     private StaDescService staDescService;
 
+    @RequestMapping(value = "/staDesc/init/auth")
+    @ManagerAuth(memo = "鍒濆鍖栫珯鐐硅矾寰�")
+    public R init(StaDescInitParam param) {
+        try{
+            if (param.getTypeDesc()==1){
+                staDescService.delete(new EntityWrapper<>());
+            }
+            String[] startStaList = param.getStartStaList().split(";");
+            String[] endStaList = param.getEndStaList().split(";");
+            List<StaDesc> staDescList = new ArrayList<>();
+            for (String startSta : startStaList){
+                for (String endSta : endStaList){
+                    for (Integer type:param.getType()){
+                        int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
+                                .eq("type_no", type)
+                                .eq("stn_no", Integer.parseInt(startSta))
+                                .eq("crn_no", param.getCrnNo())
+                                .eq("crn_stn", Integer.parseInt(endSta)));
+                        if (sameRes > 0) {
+                            continue;
+                        }
+                        StaDesc staDesc = new StaDesc();
+                        staDesc.setCrnNo(param.getCrnNo());
+                        staDesc.setTypeNo(type);
+                        staDesc.setStnNo(Integer.parseInt(startSta));
+                        staDesc.setCrnStn(Integer.parseInt(endSta));
+                        staDesc.setModiUser(getUserId());
+                        staDesc.setModiTime(new Date());
+                        staDesc.setAppeUser(getUserId());
+                        staDesc.setAppeTime(new Date());
+                        staDescList.add(staDesc);
+                        staDescService.insert(staDesc);
+                    }
+                }
+            }
+//            staDescService.insertBatch(staDescList);
+        }catch (Exception e){
+            return R.error();
+        }
+
+        return R.ok("ok1").add("ok2");
+    }
     @RequestMapping(value = "/staDesc/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") String id) {
@@ -44,21 +87,30 @@
         return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
-    private void convert(Map<String, Object> map, EntityWrapper wrapper){
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
-            if (entry.getKey().endsWith(">")) {
-                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
-            } else if (entry.getKey().endsWith("<")) {
-                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+            String val = String.valueOf(entry.getValue());
+            if (val.contains(RANGE_TIME_LINK)){
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
             } else {
-                wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+                wrapper.eq(entry.getKey(), val);
             }
         }
     }
 
     @RequestMapping(value = "/staDesc/add/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "绔欑偣璺緞娣诲姞")
     public R add(StaDesc staDesc) {
+        int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
+                .eq("type_no", staDesc.getTypeNo())
+                .eq("stn_no", staDesc.getStnNo())
+                .eq("crn_no", staDesc.getCrnNo())
+                .eq("crn_stn", staDesc.getCrnStn()));
+        if (sameRes > 0) {
+            return R.error("璺緞宸插瓨鍦�");
+        }
         staDesc.setModiUser(getUserId());
         staDesc.setModiTime(new Date());
         staDesc.setAppeUser(getUserId());
@@ -68,9 +120,9 @@
     }
 
 	@RequestMapping(value = "/staDesc/update/auth")
-	@ManagerAuth
+	@ManagerAuth(memo = "绔欑偣璺緞淇敼")
     public R update(StaDesc staDesc){
-        if (Cools.isEmpty(staDesc) || null==staDesc.getCrnNo()){
+        if (Cools.isEmpty(staDesc) || null==staDesc.getTypeId()){
             return R.error();
         }
         staDesc.setModiUser(getUserId());
@@ -80,7 +132,7 @@
     }
 
     @RequestMapping(value = "/staDesc/delete/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "绔欑偣璺緞鍒犻櫎")
     public R delete(@RequestParam String param){
         List<StaDesc> list = JSONArray.parseArray(param, StaDesc.class);
         if (Cools.isEmpty(list)){
@@ -93,7 +145,7 @@
     }
 
     @RequestMapping(value = "/staDesc/export/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "绔欑偣璺緞瀵煎嚭")
     public R export(@RequestBody JSONObject param){
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
         EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();

--
Gitblit v1.9.1