应急手机端代码提交

src/main/java/com/sooka/sponest/mobile/data/digitalagriculture/controller/EnterpriseController.java

@@ -17,7 +17,7 @@ import java.util.Map;
  * 饲料企业
  */
 @RestController
-@RequestMapping("AppenterpriseController")
+//@RequestMapping("AppenterpriseController")
 public class EnterpriseController {
     @Resource
     RemoteEnterpriseService remoteEnterpriseService;

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionDeliveryPersonnelLonLatController.java

@@ -1,30 +0,0 @@
-package com.sooka.sponest.mobile.data.housingconstruction;
-
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionDeliveryPersonnelLonLat;
-import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionDeliveryPersonnelLonLatService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/AppPersonnelLonLat")
-public class HousingconstructionDeliveryPersonnelLonLatController {
-    @Autowired
-    private RemoteHousingconstructionDeliveryPersonnelLonLatService personnelLonLatService;
-
-    /**
-     * 配送员添加经纬度坐标点
-     * @param personnelLonLat
-     * - personnelId    配送员id
-     * - longitude      经度
-     * - latitude       纬度
-     * @return AjaxResult
-     */
-    @PostMapping("/personner/setLonLat")
-    public AjaxResult setLonLat(@RequestBody HousingconstructionDeliveryPersonnelLonLat personnelLonLat){
-        return personnelLonLatService.setLonLat(personnelLonLat);
-    }
-}

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionEnterpriseController.java

@@ -1,40 +0,0 @@
-package com.sooka.sponest.mobile.data.housingconstruction;
-
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.PageDomain;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.core.web.page.TableSupport;
-import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionEnterpriseService;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionEnterprise;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/AppEnterpriseController")
-public class HousingconstructionEnterpriseController {
-    @Resource
-    RemoteHousingconstructionEnterpriseService housingconstructionEnterpriseService;
-
-    /**
-     * 获取企业列表
-     *
-     * @param enterprise
-     * @return
-     */
-    @GetMapping("/enterprise/getListAll")
-    public AjaxResult afforestationList(HousingconstructionEnterprise enterprise) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        String enterpriseName = enterprise.getEnterpriseName();
-        TableDataInfo listAll = housingconstructionEnterpriseService.getListAll(pageNum, pageSize, enterpriseName);
-        if (200 == listAll.getCode()) {
-            return AjaxResult.success(listAll.getRows());
-        } else {
-            return AjaxResult.error(listAll.getCode(), listAll.getMsg());
-        }
-    }
-}

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionRealnameuserController.java

@@ -1,39 +0,0 @@
-package com.sooka.sponest.mobile.data.housingconstruction;
-
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.PageDomain;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.core.web.page.TableSupport;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionRealnameuser;
-import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionEnterpriseService;
-import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionRealnameuserService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/AppHousingconstructionRealnameuserController")
-public class HousingconstructionRealnameuserController {
-
-    @Resource
-    RemoteHousingconstructionRealnameuserService housingconstructionRealnameuserService;
-
-    @GetMapping("/realnameuser/getRealNameUserListAllByType")
-    public AjaxResult getRealNameUserListAllByType(HousingconstructionRealnameuser realnameuser){
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        String userName = realnameuser.getUserName();
-        TableDataInfo list = housingconstructionRealnameuserService.getRealNameUserListAllByType(realnameuser.getEnterpriseId(),realnameuser.getEnterpriseUserType(), userName, pageNum, pageSize);
-        System.out.println("list = " + list);
-        if(200== list.getCode()){
-            return AjaxResult.success(list.getRows());
-        }else{
-            return AjaxResult.error(list.getCode(), list.getMsg());
-        }
-    }
-
-
-}

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionSafetyinspectionitemController.java

@@ -1,28 +0,0 @@
-/*
-package com.sooka.sponest.mobile.data.housingconstruction;
-
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionitem;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionrecords;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionrecordsdetail;
-import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionSafetyinspectionitemService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/AppSafetyinspectionitemController")
-public class HousingconstructionSafetyinspectionitemController {
-
-    @Resource
-    RemoteHousingconstructionSafetyinspectionitemService housingconstructionSafetyinspectionitemService;
-
-
-}
-*/

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionSafetyinspectionrecordsController.java

@@ -1,128 +0,0 @@
-package com.sooka.sponest.mobile.data.housingconstruction;
-
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.PageDomain;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.core.web.page.TableSupport;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionAttach;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionitem;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionrecords;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionrecordsdetail;
-import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionSafetyinspectionitemService;
-import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionSafetyinspectionrecordsService;
-import com.sooka.sponest.mobile.remoteapi.RemoteSystemBaseService;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-@RestController
-@RequestMapping("AppHousingconstructionSafetyinspectionrecordsController")
-public class HousingconstructionSafetyinspectionrecordsController {
-
-    @Resource
-    RemoteHousingconstructionSafetyinspectionrecordsService safetyinspectionrecordsService;
-
-    @Resource
-    RemoteHousingconstructionSafetyinspectionitemService housingconstructionSafetyinspectionitemService;
-
-    @GetMapping("/safetyinspectionrecords/list")
-    public AjaxResult getList(HousingconstructionSafetyinspectionrecords records) {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        TableDataInfo resultData = safetyinspectionrecordsService.getList(pageNum, pageSize, records.getEnterpriseInspectionType());
-
-        if (200 == resultData.getCode()) {
-            return AjaxResult.success(resultData.getRows());
-        } else {
-            return AjaxResult.error(resultData.getCode(), resultData.getMsg());
-        }
-    }
-
-    @GetMapping("/safetyinspectionrecords/edit")
-    public AjaxResult getRecordDetailById(HousingconstructionSafetyinspectionrecords recordVO) {
-        if (StringUtils.isEmpty(recordVO.getId())) {
-            return getTemplate(recordVO.getEnterpriseInspectionType());
-        } else {
-            AjaxResult recordDetailById = safetyinspectionrecordsService.getRecordDetailById(recordVO.getId());
-            Map<String, Object> record = (Map<String, Object>) recordDetailById.get("data");
-            String oldIp = SpringUtils.getBean(RemoteSystemBaseService.class).selectConfigKey("fileUrl").getData();
-            String newIp = SpringUtils.getBean(RemoteSystemBaseService.class).selectConfigKey("appUrl").getData();
-
-            List<Map<String, Object>> detailList = (List<Map<String, Object>>) record.get("detailList");
-            for (Map<String, Object> detail : detailList) {
-                List<Map<String, Object>> attachList = (List<Map<String, Object>>) detail.get("attachList");
-                for (Map<String, Object> attach : attachList) {
-                    String string = MapUtils.getString(attach, "attachPath");
-                    attach.put("realUrl",string.replaceAll(oldIp, newIp));
-                }
-            }
-            return AjaxResult.success(record);
-        }
-    }
-
-    @PostMapping("/safetyinspectionrecords")
-    public AjaxResult addSafetyinspectionrecords(@RequestBody HousingconstructionSafetyinspectionrecords record) {
-        List<HousingconstructionSafetyinspectionrecordsdetail> detailList = record.getDetailList();
-        detailList.forEach(detail->{
-            List<HousingconstructionAttach> attachList = detail.getAttachList();
-            for (int i = 0; i < attachList.size(); i++) {
-                HousingconstructionAttach attach = attachList.get(i);
-                attach.setAttachPath(attach.getRealUrl());
-                attach.setAttachSorts(Long.parseLong(String.valueOf(i)));
-            }
-        });
-        return safetyinspectionrecordsService.addSafetyinspectionrecords(record);
-    }
-
-    @PostMapping("/safetyinspectionrecords/put")
-    public AjaxResult putSafetyinspectionrecords(@RequestBody HousingconstructionSafetyinspectionrecords record) {
-        List<HousingconstructionSafetyinspectionrecordsdetail> detailList = record.getDetailList();
-        detailList.forEach(detail->{
-            List<HousingconstructionAttach> attachList = detail.getAttachList();
-            for (int i = 0; i < attachList.size(); i++) {
-                HousingconstructionAttach attach = attachList.get(i);
-                attach.setBusId(detail.getId());
-                attach.setAttachPath(attach.getRealUrl());
-                attach.setAttachSorts(Long.parseLong(String.valueOf(i)));
-            }
-        });
-        return safetyinspectionrecordsService.putSafetyinspectionrecords(record);
-    }
-
-
-    public AjaxResult getTemplate(String enterpriseInspectionType) {
-        // 获取列表数据
-        AjaxResult listResult = housingconstructionSafetyinspectionitemService.getList(enterpriseInspectionType);
-
-        // 从 AjaxResult 中提取数据
-        List<Map<String, Object>> data = (List<Map<String, Object>>) listResult.get("data");
-        if (data == null) {
-            return AjaxResult.error("No data found");
-        }
-
-        // 将数据转换为详细记录列表
-        List<HousingconstructionSafetyinspectionrecordsdetail> detailList = new ArrayList<>();
-        for (Map<String, Object> item : data) {
-            try {
-                String id = MapUtils.getString(item, "id");
-                String inspectionName = MapUtils.getString(item, "inspectionName");
-                int inspectionSort = MapUtils.getInteger(item, "inspectionSort");
-                HousingconstructionSafetyinspectionrecordsdetail detail = new HousingconstructionSafetyinspectionrecordsdetail(id, inspectionName, inspectionSort, "0", "", new ArrayList<>());
-                detailList.add(detail);
-            } catch (NumberFormatException e) {
-                // 处理解析整数失败的情况
-                return AjaxResult.error("Invalid data format");
-            }
-        }
-
-        // 创建并返回结果数据
-        HousingconstructionSafetyinspectionrecords resultData = new HousingconstructionSafetyinspectionrecords();
-        resultData.setDetailList(detailList);
-        return AjaxResult.success(resultData);
-    }
-}

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionSteelcylinderController.java

@@ -1,120 +0,0 @@
-package com.sooka.sponest.mobile.data.housingconstruction;
-
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.PageDomain;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.core.web.page.TableSupport;
-import com.ruoyi.common.security.utils.DictUtils;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionCar;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionPractitioner;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSteelcylinder;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSteelcylinderLog;
-import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionSteelcylinderService;
-import com.sooka.sponest.mobile.utils.DictUtil;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 钢瓶基础数据Controller
- *
- * @author 韩福成
- * @date 2024-07-30
- */
-@RestController
-@RequestMapping("/AppHousingconstructionSteelcylinderController")
-public class HousingconstructionSteelcylinderController{
-    @Resource
-    RemoteHousingconstructionSteelcylinderService steelcylinderService;
-
-    /**
-     * 巡检: 根据选择的用户获取钢瓶列表
-     * @param steelcy
-     * @return
-     */
-    @GetMapping("/steelcylinder/getSteelcylinderList")
-    public AjaxResult getRealNameUserListAllByType(HousingconstructionSteelcylinderLog steelcy){
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        String steelcylinderName = steelcy.getSteelcylinderName();
-        String joinHouseId = steelcy.getJoinHouseId();
-        TableDataInfo resultData = steelcylinderService.getSteelcylinderList(pageNum, pageSize, steelcylinderName, joinHouseId);
-        if(200 == resultData.getCode()){
-            return AjaxResult.success(resultData.getRows());
-        }else{
-            return AjaxResult.error(resultData.getCode(), resultData.getMsg());
-        }
-    }
-
-    /**
-     * 运营: 获取钢瓶列表
-     */
-    @GetMapping("/getList")
-    public AjaxResult getList(HousingconstructionSteelcylinder steelcylinder){
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        String state = steelcylinder.getState();
-        String name = steelcylinder.getName();
-        TableDataInfo list = steelcylinderService.getList(pageNum, pageSize, state, name);
-
-        Map<String, Object> steelcylinderState = DictUtils.getDictCacheToMap("steelcylinder_state");
-        Map<String, Object> steelcylinderType = DictUtils.getDictCacheToMap("steelcylinder_type");
-
-
-        if(200 == list.getCode()){
-            List<Map<String, Object>> rows = (List<Map<String, Object>>) list.getRows();
-            rows.forEach(row->{
-                row.put("standardsLabel", MapUtils.getString(steelcylinderType, MapUtils.getString(row, "standards")));
-                row.put("stateLabel", MapUtils.getString(steelcylinderState, MapUtils.getString(row, "state")));
-            });
-            return AjaxResult.success(rows);
-        }else{
-            return AjaxResult.error(list.getCode(), list.getMsg());
-        }
-    }
-
-    /**
-     *  获取人员接口
-     */
-    @GetMapping("/getPersonList")
-    public AjaxResult getPersonList(HousingconstructionPractitioner practitioner){
-        String post = practitioner.getPost();
-        String enterpriseId = practitioner.getEnterpriseId();
-        if("personnel_psy".equals(post)){
-            return steelcylinderService.getPersonListToPSY(post, enterpriseId);
-        }else{
-            return steelcylinderService.getPersonList(post, enterpriseId);
-        }
-    }
-
-    /**
-     * 获取车辆列表
-     */
-    @GetMapping("/getCarList")
-    public AjaxResult getCarList(HousingconstructionCar car){
-        String enterpriseId = car.getEnterpriseId();
-        return steelcylinderService.getCarList(enterpriseId);
-    }
-
-    /**
-     * 根据钢瓶id查询最后入户的用户id
-     */
-    @GetMapping("/getSteelcylinderLog")
-    public AjaxResult getSteelcylinderLog(@RequestParam("steelcylinderId") String steelcylinderId){
-        return steelcylinderService.getSteelcylinderLog(steelcylinderId);
-    }
-
-    /**
-     * 钢瓶流转
-     */
-    @PostMapping("/addLog")
-    public AjaxResult addLog(@RequestBody HousingconstructionSteelcylinderLog steelcylinderLog){
-        return steelcylinderService.addLog(steelcylinderLog);
-    }
-
-}

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionStoragetankController.java

@@ -1,35 +0,0 @@
-package com.sooka.sponest.mobile.data.housingconstruction;
-
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.PageDomain;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.core.web.page.TableSupport;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionStoragetank;
-import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionStoragetankService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/AppHousingconstructionStoragetankController")
-public class HousingconstructionStoragetankController {
-
-    @Autowired
-    private RemoteHousingconstructionStoragetankService storagetankService;
-
-    @GetMapping("/getStoragetankList")
-    public AjaxResult getStoragetankList(HousingconstructionStoragetank storagetank){
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        String enterpriseId = storagetank.getEnterpriseId();
-        String name = storagetank.getName();
-        TableDataInfo list = storagetankService.getStoragetankList(pageNum, pageSize, enterpriseId, name);
-        if(200 == list.getCode()){
-            return AjaxResult.success(list.getRows());
-        }else{
-            return AjaxResult.error(list.getCode(), list.getMsg());
-        }
-    }
-}