文件位置调整， 公务用车接口调整

project-admin/src/main/resources/banner.txt

@@ -1,24 +1,49 @@
 Application Version: ${ruoyi.version}
 Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
-//                          _ooOoo_                               //
-//                         o8888888o                              //
-//                         88" . "88                              //
-//                         (| ^_^ |)                              //
-//                         O\  =  /O                              //
-//                      ____/`---'\____                           //
-//                    .'  \\|     |//  `.                         //
-//                   /  \\|||  :  |||//  \                        //
-//                  /  _||||| -:- |||||-  \                       //
-//                  |   | \\\  -  /// |   |                       //
-//                  | \_|  ''\---/''  |   |                       //
-//                  \  .-\__  `-`  ___/-. /                       //
-//                ___`. .'  /--.--\  `. . ___                     //
-//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
-//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
-//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
-//      ========`-.____`-.___\_____/___.-`____.-'========         //
-//                           `=---='                              //
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
-//                            永不宕机                             //
-////////////////////////////////////////////////////////////////////
+
+                     Ki    L#,
+                    jj;     KL;
+              jD#   W Ej   .       D
+              .EK   f  W    Kj   K  t
+               # E      :,   .    E G
+               iW  tEDG:   fKEK  ; ;j
+         K..     DE     KEEDL  DE. f    L
+        fj .   LE.    EEEEEEEEEi LD.   L##
+        KiG...D  E   EE,EEEEEEEEEL E: L #WW
+         DG, E EE,  EEiKEEEEEEEEEEG K: ; D
+          K D EEE  EEK EEEEEEEEEEEEE DfLL
+           E.EEE  :EE DEEEEEEEEEEEEEE.E
+      f   E.EEEE  EEE.EEEEEEEEEEEEEEED D    f
+      ED  W:EEEf DEE EEEEEEEEEEEEEEEEED E  E
+     K.. D EEEE. EEK EEEEEEEEEEEEEEEEEE K j  .
+       , LGEEEE  EE  EEEEEEEEEEEEEEEEEEE K G G
+    EK. D EEEE; KEE :EEEEEEEEEEEEEEEEEEE.E  D ;
+   t  K E EEEE  EEE WEEEEEEEEEEEEEEEEEEEE  ;E.:
+   ;W   jEEEED  DED DEEEEEEEEEEEEEEEEEEEE K  .K
+   .GE : DEEEE  EEW EEEEEEEEEEEEEEEEEEEEE D E
+   t   K EEEEE  EEL EEEEEEEEEEEEEEEEEEED  E .
+       E EEEEE .EE, EEEEEEEEEEEEEEEEEEE   K Et,
+   EKK D EEEEE ;EE. EEEEEEEEEEEEEEEEEE   fE D.;
+     K E EEDEE iEE  EEEEEEEEEEEEEEEEE   DKK K  .
+    :L E EEEDD .EE. EEEEEEEEEEEEEEEE   KEEK . :
+   .   D WEE.K  EE; DEEEEEEEEEEEDE    EEE D L
+   W .    KED   EED KEEEEEEEEEEK    KED:E E .ED
+        K  EDE.     .DEEEEEE..    EEEK EE f
+    EDD G    EW Ki             ,EEEE;.EEKD  .
+    ::  f :   t EEE  EKKEKKEEEEEDE. ;EEE E E.
+    ;D , E E     EEi KEEEEEEEEKD  .KEEEK t  :D.
+    . .E K EEE.       tLLf:     ,EEEEED E KLE
+     t .W D.EEEE .           tKEEEEEEEtfi i  .
+      G. ; K EEEE DED  DEDEEEEEEEEEEEE K  GDL
+      , EG W,LEEE.DEE   DEEEEEEEEEEEE E
+       E  K.K;,KED EEE  LEEEEEEEEEDE E
+         D.E Ej EEGKEE;  GEEEEEEED, E    ;E
+        :  E  ,E :EKDED   :EEEEED KK t K.
+         jK  W  EE  EEED    EEj ,E  EE  .
+            E j   EE   :L    .GEi  .D,K
+            :  E    .WEEEEEEEt   jE  K
+             E i E D           L .K. j
+                L:K E :E. E  D LWt W
+                 jKK .,ED f EE j t
+                    iK  K K D.L
+

project-zcustom/src/main/java/com/project/zcustom/controller/build/PlatBuildControlController.java

@@ -1,7 +1,7 @@
 package com.project.zcustom.controller.build;
 
 import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.service.smart.IPlatBuildingService;
+import com.project.zcustom.service.service.smart.IPlatBuildingService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

project-zcustom/src/main/java/com/project/zcustom/controller/build/PlatBuildOfficeController.java

@@ -2,7 +2,7 @@ package com.project.zcustom.controller.build;
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.service.smart.IPlatBuildingService;
+import com.project.zcustom.service.service.smart.IPlatBuildingService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

project-zcustom/src/main/java/com/project/zcustom/controller/build/PlatBuildProtectController.java

@@ -2,7 +2,7 @@ package com.project.zcustom.controller.build;
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.service.smart.IPlatBuildingService;
+import com.project.zcustom.service.service.smart.IPlatBuildingService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

project-zcustom/src/main/java/com/project/zcustom/controller/crontab/PlatCrontabTaskController.java

@@ -2,7 +2,7 @@ package com.project.zcustom.controller.crontab;
 
 import com.project.common.core.controller.BaseController;
 import com.project.zcustom.domain.basics.PlatAppOrg;
-import com.project.zcustom.service.basics.IPlatAppOrgService;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
 import com.project.zcustom.tools.BuildingService;
 import com.project.zcustom.tools.GuaranteeService;
 import com.project.zcustom.tools.LogisticsService;

project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectMonitorController.java

@@ -2,7 +2,7 @@ package com.project.zcustom.controller.engineering;
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.service.basics.IPlatAppOrgService;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
 import com.project.zcustom.service.unit.ILargeCameraService;
 import com.project.zcustom.service.unit.ILargeProjectService;
 import lombok.RequiredArgsConstructor;

project-zcustom/src/main/java/com/project/zcustom/controller/logistics/LargeHousingLandController.java

@@ -0,0 +1,60 @@
+package com.project.zcustom.controller.logistics;
+
+import com.project.common.annotation.Log;
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+import com.project.common.enums.BusinessType;
+import com.project.zcustom.domain.addional.LargeHousingLand;
+import com.project.zcustom.service.logistics.ILargeHousingLandService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Arrays;
+
+@RestController
+@RequestMapping("/zcustom/housing")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeHousingLandController extends BaseController{
+
+    @Autowired
+    private ILargeHousingLandService largeHousingLandService;
+    @GetMapping("/list")
+    public AjaxResult list(LargeHousingLand entity) {
+        return AjaxResult.success("查询成功", largeHousingLandService.pagingLargePlatHousingLandList(entity));
+    }
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeHousingLandService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platHousingLand:add')")
+    @Log(title = "房产土地", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeHousingLand entity) {
+        return toAjax(largeHousingLandService.save(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platHousingLand:edit')")
+    @Log(title = "房产土地", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeHousingLand entity) {
+        return toAjax(largeHousingLandService.updateById(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platHousingLand:remove')")
+    @Log(title = "房产土地", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeHousingLandService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+
+    @PostMapping("/upload")
+    public AjaxResult upload(@RequestParam("file") MultipartFile file) {
+        return toAjax(largeHousingLandService.upload(file));
+    }
+}

project-zcustom/src/main/java/com/project/zcustom/controller/logistics/PlatHousingLandController.java

@@ -47,35 +47,4 @@ public class PlatHousingLandController extends BaseController {
         return AjaxResult.success("查询成功", largeHousingLandService.getInvestFinishState());
     }
 
-    @GetMapping("/list")
-    public AjaxResult list(LargeHousingLand entity) {
-        return AjaxResult.success("查询成功", largeHousingLandService.pagingLargePlatHousingLandList(entity));
-    }
-
-
-    @GetMapping(value = "/getInfo/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success("查询成功", largeHousingLandService.getById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('zcustom:platHousingLand:add')")
-    @Log(title = "房产土地", businessType = BusinessType.INSERT)
-    @PostMapping("add")
-    public AjaxResult add(@RequestBody LargeHousingLand entity) {
-        return toAjax(largeHousingLandService.save(entity));
-    }
-
-    @PreAuthorize("@ss.hasPermi('zcustom:platHousingLand:edit')")
-    @Log(title = "房产土地", businessType = BusinessType.UPDATE)
-    @PostMapping("edit")
-    public AjaxResult edit(@RequestBody LargeHousingLand entity) {
-        return toAjax(largeHousingLandService.updateById(entity));
-    }
-
-    @PreAuthorize("@ss.hasPermi('zcustom:platHousingLand:remove')")
-    @Log(title = "房产土地", businessType = BusinessType.DELETE)
-    @GetMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(largeHousingLandService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
 }

project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatBasicsController.java

@@ -2,9 +2,9 @@ package com.project.zcustom.controller.service;
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.service.basics.IPlatBasicsCompanyService;
-import com.project.zcustom.service.basics.IPlatBasicsServerService;
-import com.project.zcustom.service.basics.IPlatBasicsService;
+import com.project.zcustom.service.service.basics.IPlatBasicsCompanyService;
+import com.project.zcustom.service.service.basics.IPlatBasicsServerService;
+import com.project.zcustom.service.service.basics.IPlatBasicsService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatEmployeeController.java

@@ -3,7 +3,7 @@ package com.project.zcustom.controller.service;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.zcustom.service.access.IPlatAccessService;
-import com.project.zcustom.service.employee.IPlatEmployeeTypeService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeTypeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatEmployeeHealthController.java

@@ -2,8 +2,8 @@ package com.project.zcustom.controller.service;
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthIllnessService;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthIllnessService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatGreenSmartController.java

@@ -3,7 +3,7 @@ package com.project.zcustom.controller.service;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.zcustom.domain.smart.PlatGreenSmart;
-import com.project.zcustom.service.smart.*;
+import com.project.zcustom.service.service.smart.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatPostStationController.java

@@ -3,8 +3,8 @@ package com.project.zcustom.controller.service;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.zcustom.service.access.IPlatAccessService;
-import com.project.zcustom.service.post.IPlatPostStationChartService;
-import com.project.zcustom.service.post.IPlatPostStationService;
+import com.project.zcustom.service.service.post.IPlatPostStationChartService;
+import com.project.zcustom.service.service.post.IPlatPostStationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatPropertyController.java

@@ -2,9 +2,9 @@ package com.project.zcustom.controller.service;
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
-import com.project.zcustom.service.property.IPlatPropertyListService;
-import com.project.zcustom.service.property.IPlatPropertyService;
-import com.project.zcustom.service.property.IPlatPropertyToolsService;
+import com.project.zcustom.service.service.property.IPlatPropertyListService;
+import com.project.zcustom.service.service.property.IPlatPropertyService;
+import com.project.zcustom.service.service.property.IPlatPropertyToolsService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargePublicCarController.java

@@ -10,7 +10,10 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 @RestController
 @RequestMapping("/zcustom/public")
@@ -55,4 +58,9 @@ public class LargePublicCarController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(largePlatPublicCarService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }
+
+    @PostMapping("/upload")
+    public AjaxResult upload(@RequestParam("type") String type, @RequestParam("json") String json) {
+        return toAjax(largePlatPublicCarService.upload(type, json));
+    }
 }

project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeUnitController.java

@@ -6,7 +6,7 @@ import com.project.common.core.domain.AjaxResult;
 import com.project.common.enums.BusinessType;
 import com.project.common.utils.poi.ExcelUtil;
 import com.project.zcustom.domain.basics.PlatAppOrg;
-import com.project.zcustom.service.basics.IPlatAppOrgService;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCar.java

@@ -1,5 +1,6 @@
 package com.project.zcustom.domain.addional;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -18,178 +19,174 @@ public class LargeCar extends CustomBaseEntity {
     /**
      * 所属单位
      */
-    @Excel(name = "所属单位")
+
 
     private String appEncode;
 
     /**
      * 公务车实有总数
      */
-    @Excel(name = "公务车实有总数")
 
+    @JSONField(name = "gwcNum")
     private Long totalCarNum;
 
     /**
      * 商务车数量
      */
-    @Excel(name = "商务车数量")
 
+    @JSONField(name = "swc")
     private Long carNumOne;
 
     /**
      * 越野车数量
      */
-    @Excel(name = "越野车数量")
 
+    @JSONField(name = "yyc")
     private Long carNumTwo;
 
     /**
      * 小轿车数量
      */
-    @Excel(name = "小轿车数量")
 
+    @JSONField(name = "xjc")
     private Long carNumThree;
 
     /**
      * 小型客车数量
      */
-    @Excel(name = "小型客车数量")
 
+    @JSONField(name = "xxkc")
     private Long carNumFour;
 
     /**
      * 大型客车数量
      */
-    @Excel(name = "大型客车数量")
 
+    @JSONField(name = "dxkc")
     private Long carNumFive;
 
     /**
      * 企业用车数量
      */
-    @Excel(name = "企业用车数量")
 
+    @JSONField(name = "qyyc")
     private Long enterpriseCarNum;
 
     /**
      * 企业负责人用车数量
      */
-    @Excel(name = "企业负责人用车数量")
 
+    @JSONField(name = "qyfzr")
     private Long headCarNum;
 
     /**
      * 燃油车数量
      */
-    @Excel(name = "燃油车数量")
 
+    @JSONField(name = "ryc")
     private Long oilCarNum;
 
     /**
      * 新能源车数量
      */
-    @Excel(name = "新能源车数量")
 
+    @JSONField(name = "xnyc")
     private Long newPowerCarNum;
 
-    /**
-     * 公务车缺编数
-     */
-
-    private Long lackCarNum;
 
 
     /**
      * 公务车编制数
      */
-    @Excel(name = "公务车编制数")
 
+    @JSONField(name = "gwcZbs")
     private Long establishmentsCarNum;
 
     /**
      * 公务车年度增加数
      */
-    @Excel(name = "公务车年度增加数")
 
+    @JSONField(name = "gwcZJS")
     private Long yearAddNum;
 
     /**
      * 公务车年度减少数
      */
-    @Excel(name = "公务车年度减少数")
 
+    @JSONField(name = "gwcJSS")
     private Long yearReduceNum;
 
     /**
      * 公务车终端数
      */
+    @JSONField(name = "terminalTotal")
     private Long terminalTotal;
 
     /**
      * 公务车终端安装数
      */
-
+    @JSONField(name = "terminalInstall")
     private Long terminalInstall;
 
     /**
      * 公务车终端在线数
      */
-
+    @JSONField(name = "online")
     private Long terminalOnline;
 
     /**
      * 处置未归档数量
      */
-    @Excel(name = "处置未归档数量")
 
+    @JSONField(name = "CZWGD")
     private Long notArchivedNum;
 
     /**
      * 未带工单数
      */
-    @Excel(name = "未带工单数")
 
+    @JSONField(name = "noPid")
     private Long noPidNum;
 
     /**
      * 超速预警数
      */
-    @Excel(name = "超速预警数")
 
+    @JSONField(name = "overSpeed")
     private Long overSpeedNum;
 
     /**
      * 节假日预警数
      */
-    @Excel(name = "节假日预警数")
 
+    @JSONField(name = "Holiday")
     private Long holidayNum;
 
     /**
      * 派车单总数
      */
-    @Excel(name = "派车单总数")
 
+    @JSONField(name = "pcdNum")
     private String pcdNum;
 
     /**
      * 均车派车单数
      */
-    @Excel(name = "均车派车单数")
 
+    @JSONField(name = "gwcTotal")
     private String avgPcdNum;
 
     /**
      * 公务车行驶总里程
      */
-    @Excel(name = "公务车行驶总里程")
 
+    @JSONField(name = "mileCount")
     private String mileCount;
 
     /**
      * 均车里程
      */
-    @Excel(name = "均车里程")
 
+    @JSONField(name = "avgMile")
     private String avgMile;
 }

project-zcustom/src/main/java/com/project/zcustom/mapper/logistics/PlatHousingLandMapper.java

@@ -2,6 +2,7 @@ package com.project.zcustom.mapper.logistics;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.project.zcustom.domain.addional.LargeHousingLand;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.Map;
@@ -12,4 +13,6 @@ public interface PlatHousingLandMapper extends BaseMapper<LargeHousingLand> {
     Map<String, Object> getStockOfLandResources();
 
     Map<String, Object> getInvestFinishState();
+
+    int upload(List<LargeHousingLand> data);
 }

project-zcustom/src/main/java/com/project/zcustom/mapper/basics/PlatAppOrgMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/basics/PlatAppOrgMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.basics;
+package com.project.zcustom.mapper.service.basics;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;

project-zcustom/src/main/java/com/project/zcustom/mapper/basics/PlatBasicsCompanyMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/basics/PlatBasicsCompanyMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.basics;
+package com.project.zcustom.mapper.service.basics;
 
 import com.project.zcustom.domain.basics.PlatBasicsCompany;
 import com.github.yulichang.base.MPJBaseMapper;

project-zcustom/src/main/java/com/project/zcustom/mapper/basics/PlatBasicsMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/basics/PlatBasicsMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.basics;
+package com.project.zcustom.mapper.service.basics;
 
 import com.project.zcustom.domain.basics.PlatBasics;
 import com.github.yulichang.base.MPJBaseMapper;

project-zcustom/src/main/java/com/project/zcustom/mapper/basics/PlatBasicsServerMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/basics/PlatBasicsServerMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.basics;
+package com.project.zcustom.mapper.service.basics;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

project-zcustom/src/main/java/com/project/zcustom/mapper/basics/PlatBasicsSystemMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/basics/PlatBasicsSystemMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.basics;
+package com.project.zcustom.mapper.service.basics;
 
 import com.project.zcustom.domain.basics.PlatBasicsSystem;
 import com.github.yulichang.base.MPJBaseMapper;

project-zcustom/src/main/java/com/project/zcustom/mapper/post/PlatPostStationChartMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/post/PlatPostStationChartMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.post;
+package com.project.zcustom.mapper.service.post;
 
 import com.project.zcustom.domain.post.PlatPostStationChart;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

project-zcustom/src/main/java/com/project/zcustom/mapper/post/PlatPostStationMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/post/PlatPostStationMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.post;
+package com.project.zcustom.mapper.service.post;
 
 import com.project.zcustom.domain.post.PlatPostStation;
 import com.github.yulichang.base.MPJBaseMapper;

project-zcustom/src/main/java/com/project/zcustom/mapper/property/PlatPropertyListMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/property/PlatPropertyListMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.property;
+package com.project.zcustom.mapper.service.property;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

project-zcustom/src/main/java/com/project/zcustom/mapper/property/PlatPropertyMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/property/PlatPropertyMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.property;
+package com.project.zcustom.mapper.service.property;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

project-zcustom/src/main/java/com/project/zcustom/mapper/property/PlatPropertyToolsMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/property/PlatPropertyToolsMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.property;
+package com.project.zcustom.mapper.service.property;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

project-zcustom/src/main/java/com/project/zcustom/mapper/smart/PlatGreenFoodsMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/smart/PlatGreenFoodsMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.smart;
+package com.project.zcustom.mapper.service.smart;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

project-zcustom/src/main/java/com/project/zcustom/mapper/smart/PlatGreenSmartDegreeMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/smart/PlatGreenSmartDegreeMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.smart;
+package com.project.zcustom.mapper.service.smart;
 
 import com.project.zcustom.domain.smart.PlatGreenSmartDegree;
 import com.github.yulichang.base.MPJBaseMapper;

project-zcustom/src/main/java/com/project/zcustom/mapper/smart/PlatGreenSmartEnergyMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/smart/PlatGreenSmartEnergyMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.smart;
+package com.project.zcustom.mapper.service.smart;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

project-zcustom/src/main/java/com/project/zcustom/mapper/smart/PlatGreenSmartMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/smart/PlatGreenSmartMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.smart;
+package com.project.zcustom.mapper.service.smart;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

project-zcustom/src/main/java/com/project/zcustom/mapper/smart/PlatGreenSmartOtherMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/smart/PlatGreenSmartOtherMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.smart;
+package com.project.zcustom.mapper.service.smart;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

project-zcustom/src/main/java/com/project/zcustom/mapper/smart/PlatGreenSmartRankMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/smart/PlatGreenSmartRankMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.smart;
+package com.project.zcustom.mapper.service.smart;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

project-zcustom/src/main/java/com/project/zcustom/mapper/smart/PlatGreenSmartSafetyMapper.java → project-zcustom/src/main/java/com/project/zcustom/mapper/service/smart/PlatGreenSmartSafetyMapper.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.mapper.smart;
+package com.project.zcustom.mapper.service.smart;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

project-zcustom/src/main/java/com/project/zcustom/service/logistics/ILargeHousingLandService.java

@@ -3,6 +3,7 @@ package com.project.zcustom.service.logistics;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.addional.LargeHousingLand;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Map;
 
@@ -20,4 +21,6 @@ public interface ILargeHousingLandService extends IService<LargeHousingLand> {
      * @return 房产土地集合
      */
     public IPage<LargeHousingLand> pagingLargePlatHousingLandList(LargeHousingLand largeHousingLand);
+
+    int upload(MultipartFile file);
 }

project-zcustom/src/main/java/com/project/zcustom/service/logistics/impl/LargeHousingLandServiceImpl.java

@@ -9,13 +9,17 @@ import com.project.zcustom.domain.addional.LargeHousingLand;
 import com.project.zcustom.mapper.logistics.PlatHousingLandMapper;
 import com.project.zcustom.service.logistics.ILargeHousingLandService;
 import com.project.zcustom.service.logistics.ILargePlatAssetService;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
 @Service
 public class LargeHousingLandServiceImpl extends ServiceImpl<PlatHousingLandMapper, LargeHousingLand> implements ILargeHousingLandService {
 
@@ -61,6 +65,83 @@ public class LargeHousingLandServiceImpl extends ServiceImpl<PlatHousingLandMapp
         return baseMapper.selectPage(page, lqw);
     }
 
+    public int upload(MultipartFile file){
+        try {
+            List<LargeHousingLand> data = parseExcel(file.getInputStream());
+            platHousingLandMapper.upload(data);
+            return 1;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    // 解析 Excel 文件
+    private List<LargeHousingLand> parseExcel(InputStream inputStream) throws IOException {
+        Workbook workbook = new XSSFWorkbook(inputStream);
+        Sheet sheet = workbook.getSheetAt(0); // 获取第一个表单
+        Iterator<Row> rowIterator = sheet.iterator();
+
+        List<LargeHousingLand> data = new ArrayList<>();
+
+        // 跳过表头
+        if (rowIterator.hasNext()) {
+            rowIterator.next();
+        }
+
+        // 遍历每一行
+        while (rowIterator.hasNext()) {
+            Row row = rowIterator.next();
+            LargeHousingLand a = new LargeHousingLand();
+
+            for (int i = 0; i < row.getPhysicalNumberOfCells(); i++) {
+                Cell cell = row.getCell(i);
+
+                switch (i) {
+                    case 0:
+                        if (cell != null && cell.getCellType() == CellType.STRING) {
+                            a.setHousing(cell.getStringCellValue());
+                        }
+                        break;
+                    case 1:
+                        if (cell != null && cell.getCellType() == CellType.NUMERIC) {
+                            a.setAcreage(BigDecimal.valueOf(cell.getNumericCellValue()));
+                        }
+                        break;
+                    case 2:
+                        if (cell != null && cell.getCellType() == CellType.NUMERIC) {
+                            a.setType((long) cell.getNumericCellValue());
+                        }
+                        break;
+                    case 3:
+                        if (cell != null && cell.getCellType() == CellType.NUMERIC) {
+                            a.setOwnershipFlag((int) cell.getNumericCellValue());
+                        }
+                        break;
+                    case 4:
+                        if (cell != null && cell.getCellType() == CellType.NUMERIC) {
+                            a.setInvestmentPlanFlag((int) cell.getNumericCellValue());
+                        }
+                        break;
+                    case 5:
+                        if (cell != null && cell.getCellType() == CellType.NUMERIC) {
+                            if (DateUtil.isCellDateFormatted(cell)) {
+                                a.setConstructionTime(cell.getDateCellValue());
+                            }
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            data.add(a);
+        }
+
+        workbook.close();
+        return data;
+    }
+
     /**
      * 组装查询条件
      */

project-zcustom/src/main/java/com/project/zcustom/service/basics/IPlatAppOrgService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/basics/IPlatAppOrgService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.basics;
+package com.project.zcustom.service.service.basics;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/basics/IPlatBasicsCompanyService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/basics/IPlatBasicsCompanyService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.basics;
+package com.project.zcustom.service.service.basics;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.basics.PlatBasicsCompany;

project-zcustom/src/main/java/com/project/zcustom/service/basics/IPlatBasicsServerService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/basics/IPlatBasicsServerService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.basics;
+package com.project.zcustom.service.service.basics;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/basics/IPlatBasicsService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/basics/IPlatBasicsService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.basics;
+package com.project.zcustom.service.service.basics;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;

project-zcustom/src/main/java/com/project/zcustom/service/basics/IPlatBasicsSystemService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/basics/IPlatBasicsSystemService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.basics;
+package com.project.zcustom.service.service.basics;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.basics.PlatBasicsSystem;

project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatAppOrgServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/basics/impl/PlatAppOrgServiceImpl.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.basics.impl;
+package com.project.zcustom.service.service.basics.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.project.common.core.domain.search.PageParamVo;
 import com.project.common.utils.StringUtils;
 import com.project.zcustom.domain.basics.PlatAppOrg;
-import com.project.zcustom.mapper.basics.PlatAppOrgMapper;
-import com.project.zcustom.service.basics.IPlatAppOrgService;
+import com.project.zcustom.mapper.service.basics.PlatAppOrgMapper;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatBasicsCompanyServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/basics/impl/PlatBasicsCompanyServiceImpl.java

@@ -1,13 +1,13 @@
-package com.project.zcustom.service.basics.impl;
+package com.project.zcustom.service.service.basics.impl;
 
 import com.project.zcustom.domain.basics.PlatAppOrg;
 import com.project.zcustom.domain.basics.PlatBasics;
 import com.project.zcustom.domain.basics.PlatBasicsCompany;
-import com.project.zcustom.mapper.basics.PlatBasicsCompanyMapper;
-import com.project.zcustom.service.basics.IPlatAppOrgService;
-import com.project.zcustom.service.basics.IPlatBasicsCompanyService;
+import com.project.zcustom.mapper.service.basics.PlatBasicsCompanyMapper;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
+import com.project.zcustom.service.service.basics.IPlatBasicsCompanyService;
 import com.project.common.core.domain.search.PageParamVo;
-import com.project.zcustom.service.basics.IPlatBasicsService;
+import com.project.zcustom.service.service.basics.IPlatBasicsService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatBasicsServerServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/basics/impl/PlatBasicsServerServiceImpl.java

@@ -1,8 +1,8 @@
-package com.project.zcustom.service.basics.impl;
+package com.project.zcustom.service.service.basics.impl;
 
 import com.project.zcustom.domain.basics.PlatBasicsServer;
-import com.project.zcustom.mapper.basics.PlatBasicsServerMapper;
-import com.project.zcustom.service.basics.IPlatBasicsServerService;
+import com.project.zcustom.mapper.service.basics.PlatBasicsServerMapper;
+import com.project.zcustom.service.service.basics.IPlatBasicsServerService;
 import com.project.common.core.domain.search.PageParamVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatBasicsServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/basics/impl/PlatBasicsServiceImpl.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.basics.impl;
+package com.project.zcustom.service.service.basics.impl;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
@@ -6,14 +6,12 @@ import com.project.zcustom.domain.basics.PlatBasics;
 import com.project.zcustom.domain.basics.PlatBasicsCompany;
 import com.project.zcustom.domain.basics.PlatBasicsServer;
 import com.project.zcustom.domain.basics.PlatBasicsSystem;
-import com.project.zcustom.domain.employee.PlatEmployeeHealth;
-import com.project.zcustom.domain.employee.PlatEmployeeType;
-import com.project.zcustom.mapper.basics.PlatBasicsMapper;
-import com.project.zcustom.service.basics.IPlatBasicsCompanyService;
-import com.project.zcustom.service.basics.IPlatBasicsServerService;
-import com.project.zcustom.service.basics.IPlatBasicsService;
+import com.project.zcustom.mapper.service.basics.PlatBasicsMapper;
+import com.project.zcustom.service.service.basics.IPlatBasicsCompanyService;
+import com.project.zcustom.service.service.basics.IPlatBasicsServerService;
+import com.project.zcustom.service.service.basics.IPlatBasicsService;
 import com.project.common.core.domain.search.PageParamVo;
-import com.project.zcustom.service.basics.IPlatBasicsSystemService;
+import com.project.zcustom.service.service.basics.IPlatBasicsSystemService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,7 +23,6 @@ import com.project.common.utils.StringUtils;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.DecimalFormat;
 import java.util.*;
 
 /**

project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatBasicsSystemServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/basics/impl/PlatBasicsSystemServiceImpl.java

@@ -1,10 +1,9 @@
-package com.project.zcustom.service.basics.impl;
+package com.project.zcustom.service.service.basics.impl;
 
 import com.project.zcustom.domain.basics.PlatBasicsSystem;
-import com.project.zcustom.mapper.basics.PlatBasicsSystemMapper;
-import com.project.zcustom.service.basics.IPlatBasicsSystemService;
+import com.project.zcustom.mapper.service.basics.PlatBasicsSystemMapper;
+import com.project.zcustom.service.service.basics.IPlatBasicsSystemService;
 import com.project.common.core.domain.search.PageParamVo;
-import org.apache.poi.util.StringUtil;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

project-zcustom/src/main/java/com/project/zcustom/service/employee/IPlatEmployeeHealthChartService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/IPlatEmployeeHealthChartService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.employee;
+package com.project.zcustom.service.service.employee;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.employee.PlatEmployeeHealthChart;

project-zcustom/src/main/java/com/project/zcustom/service/employee/IPlatEmployeeHealthIllnessService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/IPlatEmployeeHealthIllnessService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.employee;
+package com.project.zcustom.service.service.employee;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.employee.PlatEmployeeHealthIllness;

project-zcustom/src/main/java/com/project/zcustom/service/employee/IPlatEmployeeHealthService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/IPlatEmployeeHealthService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.employee;
+package com.project.zcustom.service.service.employee;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.employee.PlatEmployeeHealth;

project-zcustom/src/main/java/com/project/zcustom/service/employee/IPlatEmployeeTypeFlowService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/IPlatEmployeeTypeFlowService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.employee;
+package com.project.zcustom.service.service.employee;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.employee.PlatEmployeeTypeFlow;

project-zcustom/src/main/java/com/project/zcustom/service/employee/IPlatEmployeeTypeIllnessService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/IPlatEmployeeTypeIllnessService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.employee;
+package com.project.zcustom.service.service.employee;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.employee.PlatEmployeeTypeIllness;

project-zcustom/src/main/java/com/project/zcustom/service/employee/IPlatEmployeeTypeService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/IPlatEmployeeTypeService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.employee;
+package com.project.zcustom.service.service.employee;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.employee.PlatEmployeeType;

project-zcustom/src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeHealthChartServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeHealthChartServiceImpl.java

@@ -1,8 +1,8 @@
-package com.project.zcustom.service.employee.impl;
+package com.project.zcustom.service.service.employee.impl;
 
 import com.project.zcustom.domain.employee.PlatEmployeeHealthChart;
 import com.project.zcustom.mapper.employee.PlatEmployeeHealthChartMapper;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthChartService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthChartService;
 import com.project.common.core.domain.search.PageParamVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeHealthIllnessServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeHealthIllnessServiceImpl.java

@@ -1,8 +1,8 @@
-package com.project.zcustom.service.employee.impl;
+package com.project.zcustom.service.service.employee.impl;
 
 import com.project.zcustom.domain.employee.PlatEmployeeHealthIllness;
 import com.project.zcustom.mapper.employee.PlatEmployeeHealthIllnessMapper;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthIllnessService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthIllnessService;
 import com.project.common.core.domain.search.PageParamVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeHealthServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeHealthServiceImpl.java

@@ -1,12 +1,11 @@
-package com.project.zcustom.service.employee.impl;
+package com.project.zcustom.service.service.employee.impl;
 
 import com.project.zcustom.domain.employee.PlatEmployeeHealth;
 import com.project.zcustom.domain.employee.PlatEmployeeHealthChart;
-import com.project.zcustom.domain.employee.PlatEmployeeType;
 import com.project.zcustom.mapper.employee.PlatEmployeeHealthMapper;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthChartService;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthIllnessService;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthChartService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthIllnessService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthService;
 import com.project.common.core.domain.search.PageParamVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,7 +17,6 @@ import com.project.common.utils.StringUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 
 /**

project-zcustom/src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeTypeFlowServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeTypeFlowServiceImpl.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.employee.impl;
+package com.project.zcustom.service.service.employee.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +9,7 @@ import com.project.common.core.domain.search.PageParamVo;
 import com.project.common.utils.StringUtils;
 import com.project.zcustom.domain.employee.PlatEmployeeTypeFlow;
 import com.project.zcustom.mapper.employee.PlatEmployeeTypeFlowMapper;
-import com.project.zcustom.service.employee.IPlatEmployeeTypeFlowService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeTypeFlowService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

project-zcustom/src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeTypeIllnessServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeTypeIllnessServiceImpl.java

@@ -1,9 +1,8 @@
-package com.project.zcustom.service.employee.impl;
+package com.project.zcustom.service.service.employee.impl;
 
-import com.project.zcustom.domain.basics.PlatBasicsCompany;
 import com.project.zcustom.domain.employee.PlatEmployeeTypeIllness;
 import com.project.zcustom.mapper.employee.PlatEmployeeTypeIllnessMapper;
-import com.project.zcustom.service.employee.IPlatEmployeeTypeIllnessService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeTypeIllnessService;
 import com.project.common.core.domain.search.PageParamVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeTypeServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeTypeServiceImpl.java

@@ -1,11 +1,11 @@
-package com.project.zcustom.service.employee.impl;
+package com.project.zcustom.service.service.employee.impl;
 
 import com.project.common.utils.DateUtils;
 import com.project.zcustom.domain.employee.PlatEmployeeType;
 import com.project.zcustom.domain.employee.PlatEmployeeTypeFlow;
 import com.project.zcustom.mapper.employee.PlatEmployeeTypeMapper;
-import com.project.zcustom.service.employee.IPlatEmployeeTypeFlowService;
-import com.project.zcustom.service.employee.IPlatEmployeeTypeService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeTypeFlowService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeTypeService;
 import com.project.common.core.domain.search.PageParamVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/post/IPlatPostStationChartService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/post/IPlatPostStationChartService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.post;
+package com.project.zcustom.service.service.post;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.post.PlatPostStationChart;

project-zcustom/src/main/java/com/project/zcustom/service/post/IPlatPostStationService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/post/IPlatPostStationService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.post;
+package com.project.zcustom.service.service.post;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.post.PlatPostStation;

project-zcustom/src/main/java/com/project/zcustom/service/post/impl/PlatPostStationChartServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/post/impl/PlatPostStationChartServiceImpl.java

@@ -1,9 +1,9 @@
-package com.project.zcustom.service.post.impl;
+package com.project.zcustom.service.service.post.impl;
 
 import com.project.common.utils.DateUtils;
 import com.project.zcustom.domain.post.PlatPostStationChart;
-import com.project.zcustom.mapper.post.PlatPostStationChartMapper;
-import com.project.zcustom.service.post.IPlatPostStationChartService;
+import com.project.zcustom.mapper.service.post.PlatPostStationChartMapper;
+import com.project.zcustom.service.service.post.IPlatPostStationChartService;
 import com.project.common.core.domain.search.PageParamVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.project.common.utils.StringUtils;
 
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**

project-zcustom/src/main/java/com/project/zcustom/service/post/impl/PlatPostStationServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/post/impl/PlatPostStationServiceImpl.java

@@ -1,17 +1,12 @@
-package com.project.zcustom.service.post.impl;
+package com.project.zcustom.service.service.post.impl;
 
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.TypeReference;
 import com.project.zcustom.domain.access.PlatAccess;
-import com.project.zcustom.domain.basics.PlatBasics;
-import com.project.zcustom.domain.employee.PlatEmployeeHealth;
 import com.project.zcustom.domain.post.PlatPostStation;
 import com.project.zcustom.domain.post.PlatPostStationChart;
-import com.project.zcustom.mapper.post.PlatPostStationMapper;
+import com.project.zcustom.mapper.service.post.PlatPostStationMapper;
 import com.project.zcustom.service.access.IPlatAccessService;
-import com.project.zcustom.service.post.IPlatPostStationChartService;
-import com.project.zcustom.service.post.IPlatPostStationService;
+import com.project.zcustom.service.service.post.IPlatPostStationChartService;
+import com.project.zcustom.service.service.post.IPlatPostStationService;
 import com.project.common.core.domain.search.PageParamVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/property/IPlatPropertyListService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/property/IPlatPropertyListService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.property;
+package com.project.zcustom.service.service.property;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.property.PlatPropertyList;

project-zcustom/src/main/java/com/project/zcustom/service/property/IPlatPropertyService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/property/IPlatPropertyService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.property;
+package com.project.zcustom.service.service.property;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.property.PlatProperty;

project-zcustom/src/main/java/com/project/zcustom/service/property/IPlatPropertyToolsService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/property/IPlatPropertyToolsService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.property;
+package com.project.zcustom.service.service.property;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.property.PlatPropertyTools;

project-zcustom/src/main/java/com/project/zcustom/service/property/impl/PlatPropertyListServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/property/impl/PlatPropertyListServiceImpl.java

@@ -1,8 +1,8 @@
-package com.project.zcustom.service.property.impl;
+package com.project.zcustom.service.service.property.impl;
 
 import com.project.zcustom.domain.property.PlatPropertyList;
-import com.project.zcustom.mapper.property.PlatPropertyListMapper;
-import com.project.zcustom.service.property.IPlatPropertyListService;
+import com.project.zcustom.mapper.service.property.PlatPropertyListMapper;
+import com.project.zcustom.service.service.property.IPlatPropertyListService;
 import com.project.common.core.domain.search.PageParamVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/property/impl/PlatPropertyServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/property/impl/PlatPropertyServiceImpl.java

@@ -1,18 +1,15 @@
-package com.project.zcustom.service.property.impl;
+package com.project.zcustom.service.service.property.impl;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.project.zcustom.domain.basics.PlatBasicsServer;
-import com.project.zcustom.domain.employee.PlatEmployeeHealth;
-import com.project.zcustom.domain.post.PlatPostStation;
 import com.project.zcustom.domain.property.PlatProperty;
 import com.project.zcustom.domain.property.PlatPropertyList;
 import com.project.zcustom.domain.property.PlatPropertyTools;
-import com.project.zcustom.mapper.property.PlatPropertyMapper;
-import com.project.zcustom.service.property.IPlatPropertyListService;
-import com.project.zcustom.service.property.IPlatPropertyService;
+import com.project.zcustom.mapper.service.property.PlatPropertyMapper;
+import com.project.zcustom.service.service.property.IPlatPropertyListService;
+import com.project.zcustom.service.service.property.IPlatPropertyService;
 import com.project.common.core.domain.search.PageParamVo;
-import com.project.zcustom.service.property.IPlatPropertyToolsService;
+import com.project.zcustom.service.service.property.IPlatPropertyToolsService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

project-zcustom/src/main/java/com/project/zcustom/service/property/impl/PlatPropertyToolsServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/property/impl/PlatPropertyToolsServiceImpl.java

@@ -1,8 +1,8 @@
-package com.project.zcustom.service.property.impl;
+package com.project.zcustom.service.service.property.impl;
 
 import com.project.zcustom.domain.property.PlatPropertyTools;
-import com.project.zcustom.mapper.property.PlatPropertyToolsMapper;
-import com.project.zcustom.service.property.IPlatPropertyToolsService;
+import com.project.zcustom.mapper.service.property.PlatPropertyToolsMapper;
+import com.project.zcustom.service.service.property.IPlatPropertyToolsService;
 import com.project.common.core.domain.search.PageParamVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatBuildingService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/IPlatBuildingService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.smart;
+package com.project.zcustom.service.service.smart;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;

project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatGreenFoodsService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/IPlatGreenFoodsService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.smart;
+package com.project.zcustom.service.service.smart;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatGreenSmartDegreeService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/IPlatGreenSmartDegreeService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.smart;
+package com.project.zcustom.service.service.smart;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.domain.smart.PlatGreenSmartDegree;

project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatGreenSmartEnergyService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/IPlatGreenSmartEnergyService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.smart;
+package com.project.zcustom.service.service.smart;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatGreenSmartOtherService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/IPlatGreenSmartOtherService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.smart;
+package com.project.zcustom.service.service.smart;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatGreenSmartRankService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/IPlatGreenSmartRankService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.smart;
+package com.project.zcustom.service.service.smart;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatGreenSmartSafetyService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/IPlatGreenSmartSafetyService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.smart;
+package com.project.zcustom.service.service.smart;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatGreenSmartService.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/IPlatGreenSmartService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.smart;
+package com.project.zcustom.service.service.smart;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatBuildingServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/impl/PlatBuildingServiceImpl.java

@@ -1,12 +1,11 @@
-package com.project.zcustom.service.smart.impl;
+package com.project.zcustom.service.service.smart.impl;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.project.common.utils.StringUtils;
 import com.project.zcustom.domain.addional.LargeBuildingControl;
 import com.project.zcustom.mapper.unit.PlatBuildingMapper;
-import com.project.zcustom.service.smart.IPlatBuildingService;
-import com.project.zcustom.service.smart.IPlatGreenFoodsService;
+import com.project.zcustom.service.service.smart.IPlatBuildingService;
 import com.project.zcustom.tools.ApiUrlConfig;
 import com.project.zcustom.tools.BuildingService;
 import org.springframework.beans.factory.annotation.Autowired;

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenFoodsServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/impl/PlatGreenFoodsServiceImpl.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.smart.impl;
+package com.project.zcustom.service.service.smart.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.project.common.core.domain.search.PageParamVo;
 import com.project.common.utils.StringUtils;
 import com.project.zcustom.domain.smart.PlatGreenFoods;
-import com.project.zcustom.mapper.smart.PlatGreenFoodsMapper;
-import com.project.zcustom.service.smart.IPlatGreenFoodsService;
+import com.project.zcustom.mapper.service.smart.PlatGreenFoodsMapper;
+import com.project.zcustom.service.service.smart.IPlatGreenFoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenSmartDegreeServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/impl/PlatGreenSmartDegreeServiceImpl.java

@@ -1,8 +1,8 @@
-package com.project.zcustom.service.smart.impl;
+package com.project.zcustom.service.service.smart.impl;
 
 import com.project.zcustom.domain.smart.PlatGreenSmartDegree;
-import com.project.zcustom.mapper.smart.PlatGreenSmartDegreeMapper;
-import com.project.zcustom.service.smart.IPlatGreenSmartDegreeService;
+import com.project.zcustom.mapper.service.smart.PlatGreenSmartDegreeMapper;
+import com.project.zcustom.service.service.smart.IPlatGreenSmartDegreeService;
 import com.project.common.core.domain.search.PageParamVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenSmartEnergyServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/impl/PlatGreenSmartEnergyServiceImpl.java

@@ -1,11 +1,11 @@
-package com.project.zcustom.service.smart.impl;
+package com.project.zcustom.service.service.smart.impl;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.project.common.core.domain.search.PageParamVo;
 import com.project.zcustom.domain.smart.PlatGreenSmartEnergy;
-import com.project.zcustom.mapper.smart.PlatGreenSmartEnergyMapper;
-import com.project.zcustom.service.smart.IPlatGreenSmartEnergyService;
+import com.project.zcustom.mapper.service.smart.PlatGreenSmartEnergyMapper;
+import com.project.zcustom.service.service.smart.IPlatGreenSmartEnergyService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenSmartOtherServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/impl/PlatGreenSmartOtherServiceImpl.java

@@ -1,10 +1,9 @@
-package com.project.zcustom.service.smart.impl;
+package com.project.zcustom.service.service.smart.impl;
 
 import com.project.common.core.domain.search.PageParamVo;
-import com.project.zcustom.domain.employee.PlatEmployeeType;
 import com.project.zcustom.domain.smart.PlatGreenSmartOther;
-import com.project.zcustom.mapper.smart.PlatGreenSmartOtherMapper;
-import com.project.zcustom.service.smart.*;
+import com.project.zcustom.mapper.service.smart.PlatGreenSmartOtherMapper;
+import com.project.zcustom.service.service.smart.*;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.project.common.utils.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.annotation.Resource;
 import java.util.*;

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenSmartRankServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/impl/PlatGreenSmartRankServiceImpl.java

@@ -1,9 +1,9 @@
-package com.project.zcustom.service.smart.impl;
+package com.project.zcustom.service.service.smart.impl;
 
 import com.project.common.core.domain.search.PageParamVo;
 import com.project.zcustom.domain.smart.PlatGreenSmartRank;
-import com.project.zcustom.mapper.smart.PlatGreenSmartRankMapper;
-import com.project.zcustom.service.smart.IPlatGreenSmartRankService;
+import com.project.zcustom.mapper.service.smart.PlatGreenSmartRankMapper;
+import com.project.zcustom.service.service.smart.IPlatGreenSmartRankService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenSmartSafetyServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/impl/PlatGreenSmartSafetyServiceImpl.java

@@ -1,12 +1,11 @@
-package com.project.zcustom.service.smart.impl;
+package com.project.zcustom.service.service.smart.impl;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.project.common.core.domain.search.PageParamVo;
-import com.project.zcustom.domain.smart.PlatGreenSmart;
 import com.project.zcustom.domain.smart.PlatGreenSmartSafety;
-import com.project.zcustom.mapper.smart.PlatGreenSmartSafetyMapper;
-import com.project.zcustom.service.smart.IPlatGreenSmartSafetyService;
+import com.project.zcustom.mapper.service.smart.PlatGreenSmartSafetyMapper;
+import com.project.zcustom.service.service.smart.IPlatGreenSmartSafetyService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenSmartServiceImpl.java → project-zcustom/src/main/java/com/project/zcustom/service/service/smart/impl/PlatGreenSmartServiceImpl.java

@@ -1,11 +1,11 @@
-package com.project.zcustom.service.smart.impl;
+package com.project.zcustom.service.service.smart.impl;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.project.common.core.domain.search.PageParamVo;
 import com.project.zcustom.domain.smart.PlatGreenSmart;
-import com.project.zcustom.mapper.smart.PlatGreenSmartMapper;
-import com.project.zcustom.service.smart.IPlatGreenSmartService;
+import com.project.zcustom.mapper.service.smart.PlatGreenSmartMapper;
+import com.project.zcustom.service.service.smart.IPlatGreenSmartService;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
 import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;

project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargePublicCarService.java

@@ -77,4 +77,6 @@ public interface ILargePublicCarService extends IService<LargeCar> {
      */
     public void checkFieldExist(String field, String filedValue,String tips,Long id);
 
+    int upload(String type, String json);
+
 }

project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargePublicCarServiceImpl.java

@@ -1,5 +1,8 @@
 package com.project.zcustom.service.unit.impl;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,6 +15,8 @@ import com.project.zcustom.mapper.unit.LargePublicCarMapper;
 import com.project.zcustom.service.unit.ILargePublicCarService;
 import org.springframework.stereotype.Service;
 
+import java.net.URLDecoder;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -55,9 +60,6 @@ public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper,
         if (StringUtils.isNotNull(largeCar.getNewPowerCarNum())){
             lqw.eq(LargeCar::getNewPowerCarNum ,largeCar.getNewPowerCarNum());
         }
-        if (StringUtils.isNotNull(largeCar.getLackCarNum())){
-            lqw.eq(LargeCar::getLackCarNum ,largeCar.getLackCarNum());
-        }
         if (StringUtils.isNotNull(largeCar.getEstablishmentsCarNum())){
             lqw.eq(LargeCar::getEstablishmentsCarNum ,largeCar.getEstablishmentsCarNum());
         }
@@ -221,4 +223,24 @@ public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper,
         }
     }
 
+    public int upload(String type, String json){
+        try {
+            String str = URLDecoder.decode(json, "UTF-8");
+            List<LargeCar> list = JSON.parseArray(JSONObject.parseObject(str).getString("data"), LargeCar.class);
+            for (LargeCar largeCar : list){
+                LargeCar car = this.getOne(new QueryWrapper<LargeCar>().eq("app_encode", largeCar.getAppEncode()));
+                if (car != null) {
+                    largeCar.setId(car.getId());
+                    this.updateById(largeCar);
+                } else {
+                    this.save(largeCar);
+                }
+            }
+            return 1;
+        }catch (Exception e){
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
 }

project-zcustom/src/main/java/com/project/zcustom/tools/GuaranteeService.java

@@ -8,14 +8,13 @@ import com.project.common.utils.StringUtils;
 import com.project.common.utils.http.HttpUtils;
 import com.project.zcustom.domain.plat.PlatApiRecord;
 import com.project.zcustom.service.access.IPlatAccessService;
-import com.project.zcustom.service.basics.IPlatBasicsService;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthService;
-import com.project.zcustom.service.employee.IPlatEmployeeTypeService;
+import com.project.zcustom.service.service.basics.IPlatBasicsService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeTypeService;
 import com.project.zcustom.service.plat.IPlatApiRecordService;
-import com.project.zcustom.service.post.IPlatPostStationService;
-import com.project.zcustom.service.property.IPlatPropertyService;
-import com.project.zcustom.service.smart.IPlatGreenSmartOtherService;
-import com.sun.xml.internal.bind.v2.TODO;
+import com.project.zcustom.service.service.post.IPlatPostStationService;
+import com.project.zcustom.service.service.property.IPlatPropertyService;
+import com.project.zcustom.service.service.smart.IPlatGreenSmartOtherService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

project-zcustom/src/main/java/com/project/zcustom/tools/LogisticsService.java

@@ -11,7 +11,7 @@ import com.project.zcustom.domain.basics.PlatAppOrg;
 import com.project.zcustom.domain.plat.AssetMonitoringResponse;
 import com.project.zcustom.domain.plat.PlatApiRecord;
 import com.project.zcustom.mapper.logistics.PlatAssetMapper;
-import com.project.zcustom.service.basics.IPlatAppOrgService;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
 import com.project.zcustom.service.plat.IPlatApiRecordService;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;

project-zcustom/src/main/resources/mapper/zcustom/basics/PlatAppOrgMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.project.zcustom.mapper.basics.PlatAppOrgMapper">
+<mapper namespace="com.project.zcustom.mapper.service.basics.PlatAppOrgMapper">
 
     <resultMap type="com.project.zcustom.domain.basics.PlatAppOrg" id="LargeUnitResult">
         <result property="id"    column="id"    />

project-zcustom/src/main/resources/mapper/zcustom/basics/PlatBasicsServerMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.project.zcustom.mapper.basics.PlatBasicsServerMapper">
+<mapper namespace="com.project.zcustom.mapper.service.basics.PlatBasicsServerMapper">
 
     <resultMap type="PlatBasicsServer" id="PlatBasicsServerResult">
             <result property="id"    column="id"    />

project-zcustom/src/main/resources/mapper/zcustom/car/PlatCarMapper.xml

@@ -80,7 +80,6 @@
             SUM(head_car_num) AS head_car_num,
             SUM(oil_car_num) AS oil_car_num,
             SUM(new_power_car_num) AS new_power_car_num,
-            SUM(lack_car_num) AS lack_car_num,
             SUM(establishments_car_num) AS establishments_car_num,
             SUM(year_add_num) AS year_add_num,
             SUM(year_reduce_num) AS year_reduce_num

project-zcustom/src/main/resources/mapper/zcustom/logistics/PlatHousingLandMapper.xml

@@ -37,4 +37,27 @@
         FROM
             large_plat_housing_land
     </select>
+
+    <insert id="upload" parameterType="com.project.zcustom.domain.addional.LargeHousingLand">
+        insert into large_plat_housing_land (housing,
+                                          acreage,
+                                          type,
+                                          ownership_flag,
+                                          investment_plan_flag,
+                                          construction_time,
+                                          del_flag,
+                                          create_time)
+        values
+        <foreach collection="list" item="item" separator="," close=";">
+            <trim prefix="(" suffix=")" suffixOverrides=",">
+                #{item.housing},
+                #{item.acreage},
+                #{item.type},
+                #{item.ownershipFlag},
+                #{item.investmentPlanFlag},
+                #{item.constructionTime},
+            '0', sysdate()
+            </trim>
+        </foreach>
+    </insert>
 </mapper>

project-zcustom/src/main/resources/mapper/zcustom/post/PlatPostStationChartMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.project.zcustom.mapper.post.PlatPostStationChartMapper">
+<mapper namespace="com.project.zcustom.mapper.service.post.PlatPostStationChartMapper">
 
     <resultMap type="PlatPostStationChart" id="PlatPostStationChartResult">
             <result property="id"    column="id"    />

project-zcustom/src/main/resources/mapper/zcustom/property/PlatPropertyListMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.project.zcustom.mapper.property.PlatPropertyListMapper">
+<mapper namespace="com.project.zcustom.mapper.service.property.PlatPropertyListMapper">
 
     <resultMap type="PlatPropertyList" id="PlatPropertyListResult">
             <result property="id"    column="id"    />

project-zcustom/src/main/resources/mapper/zcustom/property/PlatPropertyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.project.zcustom.mapper.property.PlatPropertyMapper">
+<mapper namespace="com.project.zcustom.mapper.service.property.PlatPropertyMapper">
 
     <resultMap type="PlatProperty" id="PlatPropertyResult">
             <result property="id"    column="id"    />

project-zcustom/src/main/resources/mapper/zcustom/property/PlatPropertyToolsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.project.zcustom.mapper.property.PlatPropertyToolsMapper">
+<mapper namespace="com.project.zcustom.mapper.service.property.PlatPropertyToolsMapper">
 
     <resultMap type="PlatPropertyTools" id="PlatPropertyToolsResult">
             <result property="id"    column="id"    />

project-zcustom/src/main/resources/mapper/zcustom/smart/PlatGreenSmartEnergyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.project.zcustom.mapper.smart.PlatGreenSmartEnergyMapper">
+<mapper namespace="com.project.zcustom.mapper.service.smart.PlatGreenSmartEnergyMapper">
 
     <resultMap type="PlatGreenSmartEnergy" id="PlatGreenSmartEnergyResult">
             <result property="id"    column="id"    />

project-zcustom/src/main/resources/mapper/zcustom/smart/PlatGreenSmartFoodsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.project.zcustom.mapper.smart.PlatGreenFoodsMapper">
+<mapper namespace="com.project.zcustom.mapper.service.smart.PlatGreenFoodsMapper">
 
     <resultMap type="PlatGreenFoods" id="PlatGreenSmartFoodsResult">
             <result property="id"    column="id"    />

project-zcustom/src/main/resources/mapper/zcustom/smart/PlatGreenSmartMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.project.zcustom.mapper.smart.PlatGreenSmartMapper">
+<mapper namespace="com.project.zcustom.mapper.service.smart.PlatGreenSmartMapper">
 
     <resultMap type="PlatGreenSmart" id="PlatGreenSmartResult">
             <result property="id"    column="id"    />