添加选址因子模板

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/FzxzController.java

@@ -1,7 +1,8 @@
 package com.onemap.apply.controller.fzss;
 
+import com.onemap.apply.domain.config.fzss.AddFactorTemplateVo;
+import com.onemap.apply.domain.config.fzss.FactorTemplateDTO;
 import com.onemap.apply.domain.config.fzss.FzxzEntityDTO;
-import com.onemap.apply.domain.config.fzss.FzxzTemplateDTO;
 import com.onemap.apply.service.fzss.IFzxzService;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
@@ -74,28 +75,16 @@ public class FzxzController extends BaseController {
         return list;
     }
 
-    // /**
-    //  * 获取辅助选址模板列表
-    //  *
-    //  * @param search 预留 数据源
-    //  * @return
-    //  */
-    // @GetMapping("/GetTemplateList")
-    // public RecordTableDataInfo GetTemplateList(String search, Integer limit, Integer page) {
-    //     startRecordPage();
-    //     List<FzxzTemplateDTO> list = fzxzService.GetTemplateList(search);
-    //     return getRecordDataTable(list);
-    // }
 
     /**
      * 添加辅助选址模板
      *
-     * @param fzxzTemplateDTO
+     * @param addFactorTemplateVo
      * @return
      */
     @PostMapping("/AddTemplate")
-    public RequestResult AddTemplate(@RequestBody FzxzTemplateDTO fzxzTemplateDTO) {
-        RequestResult res = fzxzService.AddTemplate(fzxzTemplateDTO);
+    public RequestResult AddTemplate(@RequestBody AddFactorTemplateVo addFactorTemplateVo) {
+        RequestResult res = fzxzService.AddTemplate(addFactorTemplateVo);
         return res;
     }
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/AddFactorTemplateVo.java

@@ -0,0 +1,14 @@
+package com.onemap.apply.domain.config.fzss;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AddFactorTemplateVo {
+    @NotNull
+    private String landTypeCode;
+    List<FactorTemplateDTO> factors = new ArrayList<>();
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/FactorTemplateDTO.java

@@ -30,10 +30,12 @@ public class FactorTemplateDTO {
 
     @TableField("order_index")
     @JsonIgnore
-    String orderIndex;
+    Integer orderIndex;
 
     @TableField("condition_info")
     String conditionInfo;
     @JsonIgnore
-    Boolean system;
+    Boolean system = false;
+    @TableField("user_id")
+    String userId;
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/FzxzTemplateDTO.java

@@ -3,106 +3,106 @@ package com.onemap.apply.domain.config.fzss;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
-@TableName("t_fzss_fzxz_template")
-public class FzxzTemplateDTO {
-    private String bsm;
-    private String mbmc;
-    private String sjy;
-    @TableField("ydxz_bsm")
-    private String ydxz_bsm;
-    private String xzmj;
-    private String ydmjbegin;
-    private String ydmjend;
-    private String kddk;
-    private String zdpd;
-    private String mbms;
-    private String yxyz;
-
-    public String getBsm() {
-        return bsm;
-    }
-
-    public void setBsm(String bsm) {
-        this.bsm = bsm;
-    }
-
-    public String getMbmc() {
-        return mbmc;
-    }
-
-    public void setMbmc(String mbmc) {
-        this.mbmc = mbmc;
-    }
-
-    public String getSjy() {
-        return sjy;
-    }
-
-    public void setSjy(String sjy) {
-        this.sjy = sjy;
-    }
-
-    public String getYdxz_bsm() {
-        return ydxz_bsm;
-    }
-
-    public void setYdxz_bsm(String ydxz_bsm) {
-        this.ydxz_bsm = ydxz_bsm;
-    }
-
-    public String getXzmj() {
-        return xzmj;
-    }
-
-    public void setXzmj(String xzmj) {
-        this.xzmj = xzmj;
-    }
-
-    public String getYdmjbegin() {
-        return ydmjbegin;
-    }
-
-    public void setYdmjbegin(String ydmjbegin) {
-        this.ydmjbegin = ydmjbegin;
-    }
-
-    public String getYdmjend() {
-        return ydmjend;
-    }
-
-    public void setYdmjend(String ydmjend) {
-        this.ydmjend = ydmjend;
-    }
-
-    public String getKddk() {
-        return kddk;
-    }
-
-    public void setKddk(String kddk) {
-        this.kddk = kddk;
-    }
-
-    public String getZdpd() {
-        return zdpd;
-    }
-
-    public void setZdpd(String zdpd) {
-        this.zdpd = zdpd;
-    }
-
-    public String getMbms() {
-        return mbms;
-    }
-
-    public void setMbms(String mbms) {
-        this.mbms = mbms;
-    }
-
-    public String getYxyz() {
-        return yxyz;
-    }
-
-    public void setYxyz(String yxyz) {
-        this.yxyz = yxyz;
-    }
-}
+// @TableName("t_fzss_fzxz_template")
+// public class FzxzTemplateDTO {
+//     private String bsm;
+//     private String mbmc;
+//     private String sjy;
+//     @TableField("ydxz_bsm")
+//     private String ydxz_bsm;
+//     private String xzmj;
+//     private String ydmjbegin;
+//     private String ydmjend;
+//     private String kddk;
+//     private String zdpd;
+//     private String mbms;
+//     private String yxyz;
+//
+//     public String getBsm() {
+//         return bsm;
+//     }
+//
+//     public void setBsm(String bsm) {
+//         this.bsm = bsm;
+//     }
+//
+//     public String getMbmc() {
+//         return mbmc;
+//     }
+//
+//     public void setMbmc(String mbmc) {
+//         this.mbmc = mbmc;
+//     }
+//
+//     public String getSjy() {
+//         return sjy;
+//     }
+//
+//     public void setSjy(String sjy) {
+//         this.sjy = sjy;
+//     }
+//
+//     public String getYdxz_bsm() {
+//         return ydxz_bsm;
+//     }
+//
+//     public void setYdxz_bsm(String ydxz_bsm) {
+//         this.ydxz_bsm = ydxz_bsm;
+//     }
+//
+//     public String getXzmj() {
+//         return xzmj;
+//     }
+//
+//     public void setXzmj(String xzmj) {
+//         this.xzmj = xzmj;
+//     }
+//
+//     public String getYdmjbegin() {
+//         return ydmjbegin;
+//     }
+//
+//     public void setYdmjbegin(String ydmjbegin) {
+//         this.ydmjbegin = ydmjbegin;
+//     }
+//
+//     public String getYdmjend() {
+//         return ydmjend;
+//     }
+//
+//     public void setYdmjend(String ydmjend) {
+//         this.ydmjend = ydmjend;
+//     }
+//
+//     public String getKddk() {
+//         return kddk;
+//     }
+//
+//     public void setKddk(String kddk) {
+//         this.kddk = kddk;
+//     }
+//
+//     public String getZdpd() {
+//         return zdpd;
+//     }
+//
+//     public void setZdpd(String zdpd) {
+//         this.zdpd = zdpd;
+//     }
+//
+//     public String getMbms() {
+//         return mbms;
+//     }
+//
+//     public void setMbms(String mbms) {
+//         this.mbms = mbms;
+//     }
+//
+//     public String getYxyz() {
+//         return yxyz;
+//     }
+//
+//     public void setYxyz(String yxyz) {
+//         this.yxyz = yxyz;
+//     }
+// }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/FactorTemplateMapper.java

@@ -2,7 +2,6 @@ package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.onemap.apply.domain.config.fzss.FactorTemplateDTO;
-import com.onemap.apply.domain.config.fzss.FzxzTemplateDTO;
 
 /**
  * 数据层

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/FzxzTemplateMapper.java

@@ -1,13 +1,13 @@
 package com.onemap.apply.mapper.fzss;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.apply.domain.config.fzss.FzxzTemplateDTO;
+import com.onemap.apply.domain.config.fzss.FactorTemplateDTO;
 
 /**
  * 数据层
  *
  * @author onemap
  */
-public interface FzxzTemplateMapper extends BaseMapper<FzxzTemplateDTO> {
+public interface FzxzTemplateMapper extends BaseMapper<FactorTemplateDTO> {
 
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/fzss/IFzxzService.java

@@ -1,7 +1,8 @@
 package com.onemap.apply.service.fzss;
 
+import com.onemap.apply.domain.config.fzss.AddFactorTemplateVo;
+import com.onemap.apply.domain.config.fzss.FactorTemplateDTO;
 import com.onemap.apply.domain.config.fzss.FzxzEntityDTO;
-import com.onemap.apply.domain.config.fzss.FzxzTemplateDTO;
 import com.onemap.common.core.web.domain.RequestResult;
 
 import java.util.List;
@@ -20,7 +21,7 @@ public interface IFzxzService {
 
     // List<FzxzTemplateDTO> GetTemplateList(String search);
 
-    RequestResult AddTemplate(FzxzTemplateDTO fzxzTemplateDTO);
+    RequestResult AddTemplate(AddFactorTemplateVo addFactorTemplateVo);
 
     List<FzxzEntityDTO> GetFzxzList(String xmmc, String kssj, String jssj);
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/FzxzServiceImpl.java

@@ -131,32 +131,30 @@ public class FzxzServiceImpl implements IFzxzService {
         return RequestResult.success("查询成功", list);
     }
 
-    // @Override
-    // public List<FzxzTemplateDTO> GetTemplateList(String search) {
-    //     try {
-    //         QueryWrapper<FzxzTemplateDTO> wrapper = new QueryWrapper<FzxzTemplateDTO>();
-    //         if (!StringUtils.isEmpty(search)) {
-    //             wrapper.like("mbmc", search);
-    //         }
-    //         List<FzxzTemplateDTO> res = fzxzTemplateMapper.selectList(wrapper);
-    //         return res;
-    //     } catch (Exception e) {
-    //         e.printStackTrace();
-    //         return new ArrayList<FzxzTemplateDTO>();
-    //     }
-    // }
-
-    @Transactional(rollbackFor = Exception.class)
     @Override
-    public RequestResult AddTemplate(FzxzTemplateDTO fzxzTemplateDTO) {
-        try {
-            fzxzTemplateDTO.setBsm(StringUtils.getUUID());
+    public RequestResult AddTemplate(AddFactorTemplateVo addFactorTemplateVo) {
+        if (addFactorTemplateVo.getFactors() == null || addFactorTemplateVo.getFactors().size() == 0) {
+            return RequestResult.error("因子长度不能为空！", null);
+        }
+        Long userId = SecurityUtils.getUserId();
+        Map map = new HashMap<>();
+        // map.put("user_id", userId.toString());
+        map.put("user_id", "0");
+        map.put("system", false);
+        map.put("land_type_code", addFactorTemplateVo.getLandTypeCode());
+        fzxzTemplateMapper.deleteByMap(map);
+
+
+        for (int i = 0; i < addFactorTemplateVo.getFactors().size(); i++) {
+            FactorTemplateDTO fzxzTemplateDTO = addFactorTemplateVo.getFactors().get(i);
+            fzxzTemplateDTO.setId(StringUtils.getUUID());
+            // fzxzTemplateDTO.setUserId(userId.toString());
+            fzxzTemplateDTO.setUserId("0");
+            fzxzTemplateDTO.setOrderIndex(i);
+            fzxzTemplateDTO.setLandTypeCode(addFactorTemplateVo.getLandTypeCode());
             fzxzTemplateMapper.insert(fzxzTemplateDTO);
-            return RequestResult.success("保存成功！", 1);
-        } catch (Exception e) {
-            e.printStackTrace();
         }
-        return RequestResult.error("保存失败！", 0);
+        return RequestResult.success("保存成功！", 1);
     }
 
     @Override

onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/service/impl/ImageServiceImpl.java

@@ -39,7 +39,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
 /**
  * 生成图片服务