规划计划接口改写

src/main/java/com/elephant/framework/galaxy/aroad/ARoadApplication.java

 package com.elephant.framework.galaxy.aroad;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -15,7 +16,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 @SpringBootApplication
 public class ARoadApplication {
-
     public static void main(String[] args) {
         //解决Es查询异常
         System.setProperty("es.set.netty.runtime.available.processors", "false");

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcGhjhController.java

@@ -2,13 +2,12 @@ package com.elephant.framework.galaxy.aroad.module.zhjc.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjh;
 import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcGhjhService;
-import lombok.AllArgsConstructor;
+import com.elephant.framework.galaxy.aroad.response.R;
 import org.springframework.web.bind.annotation.*;
-import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
 import java.util.List;
 
@@ -20,21 +19,25 @@ import java.util.List;
  * @date 2019-05-29 10:45:50
  */
 @RestController
-@AllArgsConstructor
 @RequestMapping("/zhjc/ghjh")
 public class ZhjcGhjhController extends BaseController {
 
     private final ZhjcGhjhService zhjcGhjhService;
 
+    public ZhjcGhjhController(ZhjcGhjhService zhjcGhjhService) {
+        this.zhjcGhjhService = zhjcGhjhService;
+    }
+
     /**
      * 分页查询
+     *
      * @param page     分页对象
      * @param zhjcGhjh 智慧决策_规划计划
      * @return
      */
     @GetMapping("/page")
     public R getZhjcGhjhPage(Page page, ZhjcGhjh zhjcGhjh) {
-    return  new R<>(zhjcGhjhService.page(page,Wrappers.query(zhjcGhjh)));
+        return new R<>(zhjcGhjhService.page(page, Wrappers.query(zhjcGhjh)));
     }
 
     /**
@@ -55,6 +58,7 @@ public class ZhjcGhjhController extends BaseController  {
 
     /**
      * 获取项目跟踪坐标数据
+     *
      * @return
      */
     @GetMapping("/getXmgzShapeData")
@@ -73,40 +77,62 @@ public class ZhjcGhjhController extends BaseController  {
 
     /**
      * 新增智慧决策_规划计划
-   * @param zhjcGhjh 智慧决策_规划计划
+     *
+     * @param zhjcGhjhs 智慧决策_规划计划
      * @return R
      */
-  @SysLog("新增智慧决策_规划计划")
+    @SysLog("批量新增智慧决策_规划计划")
     @PostMapping("/add")
-  public R save(@RequestBody ZhjcGhjh zhjcGhjh){
-    return new R<>(zhjcGhjhService.addZhjcGhjh(zhjcGhjh));
+    public R save(@RequestBody List<ZhjcGhjh> zhjcGhjhs) {
+        boolean fp = true;
+        for (ZhjcGhjh new_gh : zhjcGhjhs) {
+            fp = zhjcGhjhService.addZhjcGhjh(new_gh);
+            if (!fp) {
+                break;
+            }
         }
 
+        return new R<>(fp);
+    }
+
+
     /**
      * 修改智慧决策_规划计划
+     *
      * @param zhjcGhjh 智慧决策_规划计划
      * @return R
      */
     @SysLog("修改智慧决策_规划计划")
     @PostMapping("/update")
-  public R updateById(@RequestBody ZhjcGhjh zhjcGhjh){
+    public R updateById(@RequestBody ZhjcGhjh zhjcGhjh) {
         return new R<>(zhjcGhjhService.updateZhjcGhjh(zhjcGhjh));
     }
 
     /**
      * 通过id删除智慧决策_规划计划
+     *
      * @return R
      */
     @SysLog("删除智慧决策_规划计划")
     @PostMapping("/delete")
-  public R removeById(@RequestBody ZhjcGhjh zhjcGhjh){
-    return new R<>(zhjcGhjhService.deleteZhjcGhjh(zhjcGhjh));
+    public R removeById(@RequestBody List<ZhjcGhjh> zhjcGhjhs) {
+
+        boolean fp = true;
+        for (ZhjcGhjh del_gh : zhjcGhjhs) {
+            fp = zhjcGhjhService.deleteZhjcGhjh(del_gh);
+            if (!fp) {
+                break;
+            }
         }
+
+        return new R<>(fp);
+    }
+
     /**
      *
      */
     @GetMapping("/lxghjh")
-  public R getLxGhjh(@RequestParam("gcxmId") String gcxmId){
+    public R getLxGhjh(@RequestParam("gcxmId") String gcxmId) {
         return new R<>(zhjcGhjhService.queryLxGhjh(gcxmId));
     }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcGhjhFghjdzbController.java

@@ -2,14 +2,17 @@ package com.elephant.framework.galaxy.aroad.module.zhjc.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjh;
 import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
 import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhFghjdzb;
 import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcGhjhFghjdzbService;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
+import java.util.List;
 import java.util.UUID;
 
 
@@ -28,54 +31,70 @@ public class ZhjcGhjhFghjdzbController extends BaseController  {
 
     /**
      * 分页查询
+     *
      * @param page            分页对象
      * @param zhjcGhjhFghjdzb 智慧决策_规划计划_非规划阶段坐标表
      * @return
      */
     @GetMapping("/page")
     public R getZhjcGhjhFghjdzbPage(Page page, ZhjcGhjhFghjdzb zhjcGhjhFghjdzb) {
-    return  new R<>(zhjcGhjhFghjdzbService.page(page,Wrappers.query(zhjcGhjhFghjdzb)));
+        return new R<>(zhjcGhjhFghjdzbService.page(page, Wrappers.query(zhjcGhjhFghjdzb)));
     }
 
 
     /**
      * 通过id查询智慧决策_规划计划_非规划阶段坐标表
+     *
      * @param id id
      * @return R
      */
     @GetMapping("/{id}")
-  public R getById(@PathVariable("id") String id){
+    public R getById(@PathVariable("id") String id) {
         return new R<>(zhjcGhjhFghjdzbService.getById(id));
     }
 
     /**
      * 新增智慧决策_规划计划_非规划阶段坐标表
+     *
      * @return R
      */
     @SysLog("新增智慧决策_规划计划_非规划阶段坐标表")
     @PostMapping("/add")
-  public R save(@RequestBody ZhjcGhjhFghjdzb zhjcGhjhFghjdzb){
-    return new R<>(zhjcGhjhFghjdzbService.addFGhjdzb(zhjcGhjhFghjdzb));
+    public R save(@RequestBody List<ZhjcGhjhFghjdzb> zbList) {
+        boolean fp = true;
+        if (zbList != null) {
+
+            for (ZhjcGhjhFghjdzb new_zb : zbList) {
+                fp = zhjcGhjhFghjdzbService.addFGhjdzb(new_zb);
+                if (!fp) {
+                    break;
+                }
+            }
+        }
+
+        return new R<>(fp);
     }
 
     /**
      * 修改智慧决策_规划计划_非规划阶段坐标表
+     *
      * @return R
      */
     @SysLog("修改智慧决策_规划计划_非规划阶段坐标表")
     @PostMapping("/update")
-  public R updateById(@RequestBody ZhjcGhjhFghjdzb zhjcGhjhFghjdzb){
-    return new R<>(zhjcGhjhFghjdzbService.update(zhjcGhjhFghjdzb,Wrappers.<ZhjcGhjhFghjdzb>query().lambda().eq(ZhjcGhjhFghjdzb::getXmid,zhjcGhjhFghjdzb.getXmid())));
+    public R updateById(@RequestBody ZhjcGhjhFghjdzb zhjcGhjhFghjdzb) {
+        return new R<>(zhjcGhjhFghjdzbService.update(zhjcGhjhFghjdzb, Wrappers.<ZhjcGhjhFghjdzb>query().lambda().eq(ZhjcGhjhFghjdzb::getXmid, zhjcGhjhFghjdzb.getXmid())));
     }
 
     /**
      * 通过id删除智慧决策_规划计划_非规划阶段坐标表
+     *
      * @return R
      */
     @SysLog("删除智慧决策_规划计划_非规划阶段坐标表")
     @PostMapping("/delete")
-  public R removeById(@RequestBody ZhjcGhjhFghjdzb zhjcGhjhFghjdzb){
-    return new R<>(zhjcGhjhFghjdzbService.remove(Wrappers.<ZhjcGhjhFghjdzb>query().lambda().eq(ZhjcGhjhFghjdzb::getXmid,zhjcGhjhFghjdzb.getXmid())));
+    public R removeById(@RequestBody ZhjcGhjhFghjdzb zhjcGhjhFghjdzb) {
+        return new R<>(zhjcGhjhFghjdzbService.remove(Wrappers.<ZhjcGhjhFghjdzb>query().lambda().eq(ZhjcGhjhFghjdzb::getXmid, zhjcGhjhFghjdzb.getXmid())));
     }
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcGhjhGhjdzbController.java

@@ -2,6 +2,7 @@ package com.elephant.framework.galaxy.aroad.module.zhjc.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhFghjdzb;
 import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
 import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhGhjdzb;
@@ -10,6 +11,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
+import java.util.List;
 import java.util.UUID;
 
 
@@ -54,9 +56,19 @@ public class ZhjcGhjhGhjdzbController extends BaseController  {
    */
   @SysLog("新增智慧决策_规划计划_规划阶段坐标表")
   @PostMapping("/add")
-  public R save(@RequestBody ZhjcGhjhGhjdzb zhjcGhjhGhjdzb){
-    return new R<>(zhjcGhjhGhjdzbService.addGhjdzb(zhjcGhjhGhjdzb));
+  public R save(@RequestBody List<ZhjcGhjhGhjdzb> zbList){
+      boolean fp = true;
+      if (zbList != null) {
+        for (ZhjcGhjhGhjdzb new_zb : zbList) {
+          fp = zhjcGhjhGhjdzbService.addGhjdzb(new_zb);
+          if (!fp) {
+            break;
           }
+        }
+      }
+      return new R<>(fp);
+    }
+
 
   /**
    * 修改智慧决策_规划计划_规划阶段坐标表

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcGhjhTzzhController.java

@@ -2,6 +2,7 @@ package com.elephant.framework.galaxy.aroad.module.zhjc.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjh;
 import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
 import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhTzzh;
@@ -10,9 +11,11 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
+import java.util.List;
+
 
 /**
- * 智慧决策_规划计划_投资资金
+ * 智慧决策_规划计划_资金
  *
  * @author wangjian
  * @date 2019-05-29 10:45:56
@@ -48,13 +51,21 @@ public class ZhjcGhjhTzzhController extends BaseController  {
 
   /**
    * 新增智慧决策_规划计划_投资资金
-   * @param zhjcGhjhTzzh 智慧决策_规划计划_投资资金
+   * @param tzzhList 智慧决策_规划计划_投资资金
    * @return R
    */
   @SysLog("新增智慧决策_规划计划_投资资金")
   @PostMapping("/add")
-  public R save(@RequestBody ZhjcGhjhTzzh zhjcGhjhTzzh){
-    return new R<>(zhjcGhjhTzzhService.addZhjcGhjhTzzh(zhjcGhjhTzzh));
+  public R save(@RequestBody List<ZhjcGhjhTzzh> tzzhList){
+    boolean fp = true;
+    for (ZhjcGhjhTzzh new_zj : tzzhList) {
+      fp = zhjcGhjhTzzhService.addZhjcGhjhTzzh(new_zj);
+      if (!fp) {
+        break;
+      }
+    }
+
+    return new R<>(fp);
   }
 
   /**

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcGhjh.java

 package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -26,8 +27,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 主键
    */
-  @TableId
-  private String id;
+  @TableId(value = "id", type = IdType.AUTO)
+  private Integer id;
   /**
    * CROWID
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcGhjhFghjdzb.java

 package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -23,8 +24,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 主键
    */
-  @TableId
-  private String id;
+  @TableId(value = "id", type = IdType.AUTO)
+  private Integer id;
   /**
    * 项目id
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcGhjhGhjdzb.java

 package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -23,8 +24,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 主键
    */
-  @TableId
-  private String id;
+  @TableId(value = "id", type = IdType.AUTO)
+  private Integer id;
   /**
    * 项目id
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcGhjhTzzh.java

 package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -24,8 +25,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 主键
    */
-  @TableId
-  private String id;
+  @TableId(value = "id", type = IdType.AUTO)
+  private Integer id;
   /**
    * CROWID
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/ZhjcGhjhService.java

@@ -50,7 +50,7 @@ public interface ZhjcGhjhService extends IService<ZhjcGhjh> {
     /**
      * 新增规划计划
      */
-    Boolean addZhjcGhjh(ZhjcGhjh zhjcGhjh);
+    Boolean addZhjcGhjh(ZhjcGhjh new_gh);
 
     /**
      * 删除规划计划

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcGhjhFghjdzbServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.zhjc.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjh;
 import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhFghjdzb;
 import com.elephant.framework.galaxy.aroad.module.zhjc.entity.ZhjcGhjhGhjdzb;
 import com.elephant.framework.galaxy.aroad.module.zhjc.mapper.ZhjcGhjhFghjdzbMapper;
@@ -8,6 +10,7 @@ import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcGhjhFghjdzbSe
 import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcGhjhGhjdzbService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.UUID;
 
@@ -28,10 +31,15 @@ public class ZhjcGhjhFghjdzbServiceImpl extends ServiceImpl<ZhjcGhjhFghjdzbMappe
      * 新增非规划阶段坐标
      * @return
      */
-    public Boolean addFGhjdzb(ZhjcGhjhFghjdzb zhjcfGhjhGhjdzb) {
-        zhjcfGhjhGhjdzb.setId(UUID.randomUUID().toString().replaceAll("-",""));
-        String shape = zhjcGhjhGhjdzbService.shapeConversion(zhjcfGhjhGhjdzb.getGeomfeature());
-        zhjcfGhjhGhjdzb.setGeomfeature(shape.substring(1, shape.length()-1));
-        return zhjcGhjhFghjdzbMapper.insert(zhjcfGhjhGhjdzb)>0;
+    @Transactional
+    public Boolean addFGhjdzb(ZhjcGhjhFghjdzb new_zb) {
+        ZhjcGhjhFghjdzb old_zb = zhjcGhjhFghjdzbMapper.selectOne(Wrappers.<ZhjcGhjhFghjdzb>query().lambda().eq(ZhjcGhjhFghjdzb::getXmid,new_zb.getXmid()));
+         if (old_zb!=null){
+             zhjcGhjhFghjdzbMapper.deleteById(old_zb);
+         }
+        String shape = zhjcGhjhGhjdzbService.shapeConversion(new_zb.getGeomfeature());
+        new_zb.setGeomfeature(shape.substring(1, shape.length()-1));
+        int code =zhjcGhjhFghjdzbMapper.insert(new_zb);
+        return code>0;
     }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcGhjhServiceImpl.java

@@ -15,6 +15,7 @@ import com.elephant.framework.galaxy.aroad.response.R;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Iterator;
@@ -164,19 +165,13 @@ public class ZhjcGhjhServiceImpl extends ServiceImpl<ZhjcGhjhMapper, ZhjcGhjh> i
     /**
      * 新增规划计划
      */
-    public Boolean addZhjcGhjh(ZhjcGhjh zhjcGhjh){
-        ZhjcGhjh zhjcGhjh1 = zhjcGhjhMapper.selectOne(Wrappers.<ZhjcGhjh>query().lambda().eq(ZhjcGhjh::getXmid,zhjcGhjh.getXmid()).eq(ZhjcGhjh::getXmjd,zhjcGhjh.getXmjd()).eq(ZhjcGhjh::getXmlxdm,zhjcGhjh.getXmlxdm()));
-        zhjcGhjh.setId(UUID.randomUUID().toString().replaceAll("-", ""));
-        zhjcGhjh.setSfzxzt("1");
-        ZhjcGhjh zhjcGhjh2 = new ZhjcGhjh();
-        zhjcGhjh2.setSfzxzt("0");
-        zhjcGhjhMapper.update(zhjcGhjh2,Wrappers.<ZhjcGhjh>query().lambda().eq(ZhjcGhjh::getXmbm,zhjcGhjh.getXmbm()));
-        int code = zhjcGhjhMapper.insert(zhjcGhjh);
-        if(code>0) {
-            if(zhjcGhjh1!=null && zhjcGhjh1.getId()!=null && !"".equals(zhjcGhjh1.getId().trim())) {
-                zhjcGhjhMapper.delete(Wrappers.<ZhjcGhjh>query().lambda().eq(ZhjcGhjh::getId,zhjcGhjh1.getId()));
-            }
+    @Transactional
+    public Boolean addZhjcGhjh(ZhjcGhjh new_gh){
+          ZhjcGhjh old_gh = zhjcGhjhMapper.selectOne(Wrappers.<ZhjcGhjh>query().lambda().eq(ZhjcGhjh::getXmid,new_gh.getXmid()).eq(ZhjcGhjh::getXmjd,new_gh.getXmjd()).eq(ZhjcGhjh::getXmlxdm,new_gh.getXmlxdm()));
+           if(old_gh != null) {
+              zhjcGhjhMapper.deleteById(old_gh.getId());
            }
+          int code = zhjcGhjhMapper.insert(new_gh);
           return code>0;
     }
 
@@ -186,9 +181,7 @@ public class ZhjcGhjhServiceImpl extends ServiceImpl<ZhjcGhjhMapper, ZhjcGhjh> i
      */
     public Boolean deleteZhjcGhjh(ZhjcGhjh zhjcGhjh2) {
         ZhjcGhjh zhjcGhjh = zhjcGhjhMapper.selectOne(Wrappers.<ZhjcGhjh>query().lambda().eq(ZhjcGhjh::getXmid,zhjcGhjh2.getXmid()).eq(ZhjcGhjh::getXmjd,zhjcGhjh2.getXmjd()));
-        if("".equals(zhjcGhjh.getId().trim()) && zhjcGhjh.getId()==null) {
-            return false;
-        }
+
         zhjcGhjhMapper.delete(Wrappers.<ZhjcGhjh>query().lambda().eq(ZhjcGhjh::getXmid,zhjcGhjh2.getXmid()).eq(ZhjcGhjh::getXmjd,zhjcGhjh2.getXmjd()));
 
         List<ZhjcGhjh> zhjcGhjhs = zhjcGhjhMapper.selectList(Wrappers.<ZhjcGhjh>query().lambda().eq(ZhjcGhjh::getXmbm, zhjcGhjh.getXmbm()).orderByDesc(ZhjcGhjh::getXmjd));

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcGhjhTzzhServiceImpl.java

@@ -8,7 +8,9 @@ import com.elephant.framework.galaxy.aroad.module.zhjc.mapper.ZhjcGhjhTzzhMapper
 import com.elephant.framework.galaxy.aroad.module.zhjc.service.ZhjcGhjhTzzhService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.beans.Transient;
 import java.util.UUID;
 
 /**
@@ -33,22 +35,21 @@ public class ZhjcGhjhTzzhServiceImpl extends ServiceImpl<ZhjcGhjhTzzhMapper, Zhj
     /**
      * 新增 规划计划投资资金
      */
-    public Boolean addZhjcGhjhTzzh(ZhjcGhjhTzzh zhjcGhjhTzzh) {
-        ZhjcGhjhTzzh zhjcGhjhTzzh1 = null;
-        if(zhjcGhjhTzzh.getXmjd().startsWith("1") || zhjcGhjhTzzh.getXmjd().startsWith("2")) {
-            zhjcGhjhTzzh1 = zhjcGhjhTzzhMapper.selectOne(Wrappers.<ZhjcGhjhTzzh>query().lambda().eq(ZhjcGhjhTzzh::getXmid,zhjcGhjhTzzh.getXmid()).eq(ZhjcGhjhTzzh::getXmjd,zhjcGhjhTzzh.getXmjd()));
+    @Transactional
+    public Boolean addZhjcGhjhTzzh(ZhjcGhjhTzzh new_zj) {
+        ZhjcGhjhTzzh old_zj = null;
+        if(new_zj.getXmjd().startsWith("1") || new_zj.getXmjd().startsWith("2")) {
+            old_zj = zhjcGhjhTzzhMapper.selectOne(Wrappers.<ZhjcGhjhTzzh>query().lambda().eq(ZhjcGhjhTzzh::getXmid,new_zj.getXmid()).eq(ZhjcGhjhTzzh::getXmjd,new_zj.getXmjd()));
         }else{
-            zhjcGhjhTzzh1 = zhjcGhjhTzzhMapper.selectOne(Wrappers.<ZhjcGhjhTzzh>query().lambda().eq(ZhjcGhjhTzzh::getCrowid,zhjcGhjhTzzh.getCrowid()));
+            old_zj = zhjcGhjhTzzhMapper.selectOne(Wrappers.<ZhjcGhjhTzzh>query().lambda().eq(ZhjcGhjhTzzh::getCrowid,new_zj.getCrowid()));
         }
 
-        zhjcGhjhTzzh.setId(UUID.randomUUID().toString().replaceAll("-", ""));
-        int code = zhjcGhjhTzzhMapper.insert(zhjcGhjhTzzh);
-
-        if(code>0) {
-            if(zhjcGhjhTzzh1!=null &&  zhjcGhjhTzzh1.getId()!=null && !"".equals(zhjcGhjhTzzh1.getId().trim())) {
-                zhjcGhjhTzzhMapper.delete(Wrappers.<ZhjcGhjhTzzh>query().lambda().eq(ZhjcGhjhTzzh::getId,zhjcGhjhTzzh1.getId()));
-            }
+        if (old_zj!=null){
+            zhjcGhjhTzzhMapper.deleteById(old_zj);
         }
+
+        int code = zhjcGhjhTzzhMapper.insert(new_zj);
+
         return code>0;
     }
 

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgAqscAqscsgybzhubandzibVController.java

@@ -10,6 +10,8 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
+import java.util.List;
+
 
 /**
  * VIEW
@@ -52,18 +54,27 @@ public class ZhjgAqscAqscsgybzhubandzibVController extends BaseController  {
    * @return R
    */
   @SysLog("新增VIEW")
-  @PostMapping
+  @PostMapping("/save")
   public R save(@RequestBody ZhjgAqscAqscsgybzhubandzibV zhjgAqscAqscsgybzhubandzibV){
     return new R<>(zhjgAqscAqscsgybzhubandzibVService.save(zhjgAqscAqscsgybzhubandzibV));
   }
-
+  /**
+   * 新增VIEW
+   * @param zhjgAqscAqscsgybzhubandzibVs VIEW
+   * @return R
+   */
+  @SysLog("新增VIEW")
+  @PostMapping("/batchSave")
+  public R batchSave(@RequestBody List<ZhjgAqscAqscsgybzhubandzibV> zhjgAqscAqscsgybzhubandzibVs){
+    return new R<>(zhjgAqscAqscsgybzhubandzibVService.saveBatch(zhjgAqscAqscsgybzhubandzibVs));
+  }
   /**
    * 修改VIEW
    * @param zhjgAqscAqscsgybzhubandzibV VIEW
    * @return R
    */
   @SysLog("修改VIEW")
-  @PutMapping
+  @PutMapping("/updateById")
   public R updateById(@RequestBody ZhjgAqscAqscsgybzhubandzibV zhjgAqscAqscsgybzhubandzibV){
     return new R<>(zhjgAqscAqscsgybzhubandzibVService.updateById(zhjgAqscAqscsgybzhubandzibV));
   }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgAqscDsaqqklhController.java

@@ -10,6 +10,8 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
+import java.util.List;
+
 
 /**
  * 地市安全情况量化表
@@ -52,18 +54,24 @@ public class ZhjgAqscDsaqqklhController extends BaseController  {
    * @return R
    */
   @SysLog("新增地市安全情况量化表")
-  @PostMapping
+  @PostMapping("/save")
   public R save(@RequestBody ZhjgAqscDsaqqklh zhjgAqscDsaqqklh){
     return new R<>(zhjgAqscDsaqqklhService.save(zhjgAqscDsaqqklh));
   }
 
+  @SysLog("批量新增地市安全情况量化表")
+  @PostMapping("/batchSave")
+  public R batchSave(@RequestBody List<ZhjgAqscDsaqqklh> zhjgAqscDsaqqklhs){
+    return new R<>(zhjgAqscDsaqqklhService.saveBatch(zhjgAqscDsaqqklhs));
+  }
+
   /**
    * 修改地市安全情况量化表
    * @param zhjgAqscDsaqqklh 地市安全情况量化表
    * @return R
    */
   @SysLog("修改地市安全情况量化表")
-  @PutMapping
+  @PostMapping("/updateById")
   public R updateById(@RequestBody ZhjgAqscDsaqqklh zhjgAqscDsaqqklh){
     return new R<>(zhjgAqscDsaqqklhService.updateById(zhjgAqscDsaqqklh));
   }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgAqscYhpctjController.java

@@ -10,6 +10,8 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
+import java.util.List;
+
 
 /**
  * 隐患排查统计表
@@ -52,18 +54,27 @@ public class ZhjgAqscYhpctjController extends BaseController  {
    * @return R
    */
   @SysLog("新增隐患排查统计表")
-  @PostMapping
+  @PostMapping("/save")
   public R save(@RequestBody ZhjgAqscYhpctj zhjgAqscYhpctj){
     return new R<>(zhjgAqscYhpctjService.save(zhjgAqscYhpctj));
   }
-
+  /**
+   * 批量m新增隐患排查统计表
+   * @param zhjgAqscYhpctjs 隐患排查统计表
+   * @return R
+   */
+  @SysLog("批量新增隐患排查统计表")
+  @PostMapping("/batchSave")
+  public R batchSave(@RequestBody List<ZhjgAqscYhpctj> zhjgAqscYhpctjs){
+    return new R<>(zhjgAqscYhpctjService.saveBatch(zhjgAqscYhpctjs));
+  }
   /**
    * 修改隐患排查统计表
    * @param zhjgAqscYhpctj 隐患排查统计表
    * @return R
    */
   @SysLog("修改隐患排查统计表")
-  @PutMapping
+  @PutMapping("/updateById")
   public R updateById(@RequestBody ZhjgAqscYhpctj zhjgAqscYhpctj){
     return new R<>(zhjgAqscYhpctjService.updateById(zhjgAqscYhpctj));
   }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhLkpdController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -50,6 +51,19 @@ public class ZhyhLkpdController extends BaseController  {
     return new R<>(zhyhLkpdService.getById(id));
   }
 
+  /**
+   * 新增智慧养护_路况评定批量新增
+   * @param list 智慧养护_路况评定
+   * @return R
+   */
+  @SysLog("批量新增智慧养护_路况评定")
+  @PostMapping("/batchSave")
+  public R batchSave(@RequestBody List<ZhyhLkpd> list){
+
+    return new R<>(zhyhLkpdService.saveBatch(list));
+  }
+
+
   /**
    * 新增智慧养护_路况评定
    * @param zhyhLkpd 智慧养护_路况评定

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhLkpd.java

@@ -133,7 +133,7 @@ private static final long serialVersionUID = 1L;
   /**
    * 创建时间
    */
-  private LocalDateTime createTime;
+  private String createTime;
   /**
    * 更新人
    */
@@ -141,7 +141,7 @@ private static final long serialVersionUID = 1L;
   /**
    * 更新时间
    */
-  private LocalDateTime updateTime;
+  private String updateTime;
   /**
    * 状态：根据具体需求定义
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhQldtjgLrbsjhql.java

@@ -4,18 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
+
 
 /**
  * 列入部、省计划桥梁
  *
  * @author wangjian
- * @date 2019-04-22 15:05:42
+ * @String 2019-04-22 15:05:42
  */
 @Data
 @TableName("t_zhyh_qldtjg_lrbsjhql")
@@ -59,8 +56,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 开工时间
    */
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-  private Date kgsj;
+
+  private String kgsj;
   /**
    * 工程进度
    */
@@ -68,8 +65,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 竣工时间
    */
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-  private Date jgsj;
+
+  private String jgsj;
   /**
    * 主要内容
    */
@@ -121,8 +118,7 @@ private static final long serialVersionUID = 1L;
   /**
    * 创建时间
    */
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-  private Date createTime;
+  private String createTime;
   /**
    * 更新人
    */
@@ -130,8 +126,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 更新时间
    */
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-  private Date updateTime;
+
+  private String updateTime;
   /**
    * 状态：根据具体需求定义
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/entity/ZhyhQldtjgSjzdjgql.java

@@ -59,8 +59,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 开工时间
    */
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-  private Date kgsj;
+
+  private String kgsj;
   /**
    * 工程进度
    */
@@ -68,8 +68,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 竣工时间
    */
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-  private Date jgsj;
+
+  private String jgsj;
   /**
    * 主要内容
    */
@@ -121,8 +121,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 创建时间
    */
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-  private Date createTime;
+
+  private String createTime;
   /**
    * 更新人
    */
@@ -130,8 +130,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 更新时间
    */
-  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-  private Date updateTime;
+
+  private String updateTime;
   /**
    * 状态：根据具体需求定义
    */

src/main/java/com/elephant/framework/galaxy/aroad/security/config/ResourceServerConfiguration.java

@@ -21,7 +21,7 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
 		http.formLogin()
 				.and()
 				.authorizeRequests()
-				.antMatchers( "/zhyh/lkpd/save", "/zhyh/dzxgcglgcxx/**", "/zhyh/dzxgcglgcjd/**", "/zhyh/dzxgcgljlzf/**", "/zhyh/dzxgcglysgl/**",
+				.antMatchers("/roadconditionevent/**", "/zhyh/lkpd/**","/zhyh/dzxgcglgcxx/**", "/zhyh/dzxgcglgcjd/**", "/zhyh/dzxgcgljlzf/**", "/zhyh/dzxgcglysgl/**",
 						"/zhjc/ghjhghjdzb/**", "/zhjc/ghjhtzzh/**", "/zhjc/ghjh/**", "/zhjc/ghjhfghjdzb/**",
 						"/zhyh/qldtjglrbsjhql/**", "/zhyh/qldtjgsjzdjgql/**", "/szgl/spdwvideo/**","/szgl/spdwvideojn/**")
 				.permitAll()

src/main/resources/application-dev.yml

@@ -56,3 +56,5 @@ connect:
   host_2: 192.168.7.210
   host_3: 192.168.7.220
   port_net: 9300
+shape:
+  url: http://47.105.99.44:8080/sdlkapi/LRS/GetAmapGeometry?geometry=
\ No newline at end of file

src/main/resources/application-prod.yml

@@ -57,3 +57,5 @@ connect:
   host_2: 192.168.7.210
   host_3: 192.168.7.220
   port_net: 9300
+shape:
+  url: http://47.105.99.44:8080/sdlkapi/LRS/GetAmapGeometry?geometry=
\ No newline at end of file

src/main/resources/mapper/zhjc/ZhjcGhjhMapper.xml

@@ -64,7 +64,7 @@
                         and jhnf=#{jhnf}
                   </if>
             </where>
-            GROUP BY tbdwdm
+            GROUP BY tbdwmc
       </select>
 
       <select id="getGhjhTwoData" resultType="java.lang.Integer">