新增 农事功能

pom.xml

@@ -3,16 +3,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>agmp-parent</artifactId>
+        <artifactId>agmp-saas-parent</artifactId>
         <groupId>com.yunfeiyun</groupId>
         <version>1.0.0</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>agmp-fms</artifactId>
-    <name>agmp-fms</name>
-    <description>农事综合信息管理系统</description>
+    <artifactId>agmp-saas-fms</artifactId>
+    <name>agmp-saas-fms</name>
+    <description>云飞智慧农业农事综合信息管理系统</description>
     <properties>
         <agmp.framework.version>1.0.0</agmp.framework.version>
     </properties>
@@ -20,9 +20,14 @@
     <dependencies>
         <dependency>
             <groupId>com.yunfeiyun</groupId>
-            <artifactId>agmp-framework</artifactId>
+            <artifactId>agmp-saas-framework</artifactId>
             <version>${agmp.framework.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.yunfeiyun</groupId>
+            <artifactId>agmp-saas-codegen</artifactId>
+            <version>1.0.0</version>
+        </dependency>
 
         <!-- 蚂蚁链 -->
         <dependency>

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsConsoleController.java

@@ -9,12 +9,10 @@ import com.yunfeiyun.agmp.common.enums.CommonEnums;
 import com.yunfeiyun.agmp.common.enums.FmsMessageResVoType;
 import com.yunfeiyun.agmp.common.enums.TaskStatus;
 import com.yunfeiyun.agmp.common.exception.BizException;
-import com.yunfeiyun.agmp.common.utils.ConfigUtils;
+import com.yunfeiyun.agmp.common.service.WeatherService;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
-import com.yunfeiyun.agmp.common.utils.weather.WeatherReqVo;
-import com.yunfeiyun.agmp.common.utils.weather.WeatherUtil;
 import com.yunfeiyun.agmp.fms.domain.FmsBlock;
 import com.yunfeiyun.agmp.fms.domain.FmsLand;
 import com.yunfeiyun.agmp.fms.domain.FmsSolar;
@@ -75,6 +73,9 @@ public class FmsConsoleController {
     @Autowired
     private IWmsWarehouseService wmsWarehouseService;
 
+    @Autowired
+    private WeatherService weatherService;
+
 
     /**
      * 查询天气信息
@@ -202,7 +203,7 @@ public class FmsConsoleController {
         boolean b = SecurityUtils.isValidate();
         if (b) {
             List<String> strings = dataAuthUtil.landListOfBlock();
-            if (strings.size() == 0) {
+            if (strings.isEmpty()) {
                 resultMap.put("landTotal", new ArrayList<>());
                 Map<String, Object> countMap = new HashMap<>();
                 countMap.put("count1", new ArrayList<>());
@@ -330,17 +331,9 @@ public class FmsConsoleController {
     }
 
     public void getWeather(ScreenDataReqVo reqVo, Map<String, Object> resultMap) {
-        WeatherReqVo weatherReqVo;
-        try {
-            String param = ConfigUtils.ConfigKeyEnum.PROJECT_LOCATION_WEATHER_PARAM.valueOf();
-            weatherReqVo = JSONObject.parseObject(param, WeatherReqVo.class);
-        }catch (Exception e){
-            throw new BizException(ErrorCode.WEATHER_PARAM_GET_ERROR);
-        }
         FmsWeatherInfoResVo fmsWeatherInfoResVo = null;
         try {
-            String result = WeatherUtil.getWeatherNearlySevenDays(weatherReqVo);
-            JSONObject resultObj = JSONObject.parseObject(result).getJSONObject("data").getJSONObject("content");
+            JSONObject resultObj = weatherService.getProjectWeather();
             fmsWeatherInfoResVo = JSONObject.parseObject(resultObj.toString(), FmsWeatherInfoResVo.class);
             Map<String, Object> map = new HashMap<>();
             if (!StringUtils.isEmpty(fmsWeatherInfoResVo.getCityid())) {

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsPlanController.java

@@ -1,20 +1,16 @@
 package com.yunfeiyun.agmp.fms.controller;
 
-import com.alibaba.fastjson2.JSON;
 import com.yunfeiyun.agmp.common.annotation.Log;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.constant.ResConstants;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
-import com.yunfeiyun.agmp.common.core.domain.bo.PtsMsgbatchBo;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.enums.CommonEnums;
 import com.yunfeiyun.agmp.common.enums.DictTypeEnums;
 import com.yunfeiyun.agmp.common.framework.manager.RedisCacheManager;
 import com.yunfeiyun.agmp.common.framework.manager.ResManager;
-import com.yunfeiyun.agmp.common.framework.mq.MsgbatchContent;
-import com.yunfeiyun.agmp.common.framework.web.domain.server.Sys;
 import com.yunfeiyun.agmp.common.utils.DictUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsScreenController.java

@@ -2,20 +2,29 @@ package com.yunfeiyun.agmp.fms.controller;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.yunfeiyun.agmp.common.annotation.Log;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.constant.ResConstants;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
-import com.yunfeiyun.agmp.common.enums.*;
+import com.yunfeiyun.agmp.common.enums.CommonEnums;
+import com.yunfeiyun.agmp.common.enums.SpmOrderStatus;
+import com.yunfeiyun.agmp.common.enums.TaskStatus;
+import com.yunfeiyun.agmp.common.enums.TssWarnEnum;
+import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.framework.manager.ResManager;
-import com.yunfeiyun.agmp.common.utils.ConfigUtils;
+import com.yunfeiyun.agmp.common.service.LocationService;
+import com.yunfeiyun.agmp.common.service.WeatherService;
+import com.yunfeiyun.agmp.common.service.modal.LocationAddressModel;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
-import com.yunfeiyun.agmp.fms.domain.*;
+import com.yunfeiyun.agmp.common.web.system.service.ISysConfigService;
+import com.yunfeiyun.agmp.fms.domain.FmsBlock;
+import com.yunfeiyun.agmp.fms.domain.FmsLand;
+import com.yunfeiyun.agmp.fms.domain.FmsPeriod;
+import com.yunfeiyun.agmp.fms.domain.SpmOrder;
 import com.yunfeiyun.agmp.fms.domain.reqvo.*;
 import com.yunfeiyun.agmp.fms.domain.resvo.*;
 import com.yunfeiyun.agmp.fms.service.*;
@@ -24,12 +33,13 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 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 org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
@@ -74,6 +84,16 @@ public class FmsScreenController extends BaseController {
     @Autowired
     private IFmsPeriodService fmsPeriodService;
 
+    @Autowired
+    private WeatherService weatherService;
+
+    @Autowired
+    private LocationService locationService;
+
+    @Autowired
+    private ISysConfigService iSysConfigService;
+
+
     /**
      * 溯源大屏营收情况统计
      */
@@ -249,12 +269,24 @@ public class FmsScreenController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fms:screen:project:coordinate')")
     @GetMapping("/project/coordinate")
     public AjaxResult projectCoordinate(SelectCountOfScreenReqVo reqVo) {
-        String str = ConfigUtils.ConfigKeyEnum.PROJECT_LOCATION_WEATHER_PARAM.valueOf();
-        JSONObject jsonObject = JSONObject.parseObject(str);
+        JSONObject jsonObject = weatherService.getProjectWeather();
+        if (jsonObject == null) {
+            throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(), "获取项目所在地坐标失败");
+        }
+        LocationAddressModel req = new LocationAddressModel();
+        req.setProvince(jsonObject.getString("province"));
+        req.setCity(jsonObject.getString("city"));
+        req.setDistrict(jsonObject.getString("district"));
+
+        LocationAddressModel result = locationService.getLngLatByAddress(req);
+        if (result == null) {
+            throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(), "获取项目所在地坐标失败");
+        }
+
         JSONObject jsonObject1 = new JSONObject();
-        jsonObject1.put("zoneLatitude", jsonObject.getString("lat"));
-        jsonObject1.put("zoneLongitude", jsonObject.getString("lng"));
-        jsonObject1.put("city", jsonObject.getString("city"));
+        jsonObject1.put("zoneLatitude", result.getLat());
+        jsonObject1.put("zoneLongitude", result.getLng());
+        jsonObject1.put("city", req.getCity());
         return AjaxResult.success(jsonObject1);
 
     }

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsTaskController.java

@@ -15,8 +15,6 @@ import com.yunfeiyun.agmp.common.enums.*;
 import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.framework.manager.RedisCacheManager;
 import com.yunfeiyun.agmp.common.framework.manager.ResManager;
-import com.yunfeiyun.agmp.common.framework.mq.MessageContentService;
-import com.yunfeiyun.agmp.common.framework.mq.MsgbatchContent;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
@@ -25,18 +23,19 @@ import com.yunfeiyun.agmp.common.utils.serialno.NoGenerator;
 import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.common.web.system.service.ISysDictDataService;
 import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
-import com.yunfeiyun.agmp.fms.domain.*;
+import com.yunfeiyun.agmp.fms.domain.FmsBlock;
+import com.yunfeiyun.agmp.fms.domain.FmsTask;
+import com.yunfeiyun.agmp.fms.domain.FmsTaskpick;
+import com.yunfeiyun.agmp.fms.domain.FmsTaskrcd;
 import com.yunfeiyun.agmp.fms.domain.reqvo.*;
+import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskMessageResVo;
+import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskTypeCountResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskrcdInfoResVo;
 import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskExcelVo;
-import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskMessageResVo;
-import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskResVo;
-import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskrcdVo;
 import com.yunfeiyun.agmp.fms.service.*;
 import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import com.yunfeiyun.agmp.fms.util.ExportUtil;
-import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -47,7 +46,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -88,8 +86,8 @@ public class FmsTaskController extends BaseController
     private DataAuthUtil dataAuthUtil;
     @Autowired
     private IFmsBlockService fmsBlockService;
-    @Resource
-    private MessageContentService messageContentService;
+//    @Resource
+//    private MessageContentService messageContentService;
     @Resource
     private IFmsTaskassetService fmsTaskassetService;
     @Resource
@@ -333,21 +331,21 @@ public class FmsTaskController extends BaseController
             return error(ErrorCode.INVALID_PARAMETER.getCode());
         }
 
-        /* 消息通知 */
-        if (ErrorCode.SUCCESS.getCode().equals(ajaxResult.get(AjaxResult.CODE_TAG))) {
-            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
-
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("id", fmsTask.getTaskId());
-            jsonObject.put("taskNo", fmsTask.getTaskNo());
-            jsonObject.put("farmType", farmType);
-
-            msgbatchContent.setAppRedirect("/fmsPages/farm/record", jsonObject);
-
-            List<String> managers = new ArrayList<>();
-            managers.add(fmsTask.getTaskManager());
-            messageContentService.sendMsg(title, msgbatchContent,null, type, fmsTask.getTaskId(), managers);
-        }
+//        /* 消息通知 */
+//        if (ErrorCode.SUCCESS.getCode().equals(ajaxResult.get(AjaxResult.CODE_TAG))) {
+//            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
+//
+//            JSONObject jsonObject = new JSONObject();
+//            jsonObject.put("id", fmsTask.getTaskId());
+//            jsonObject.put("taskNo", fmsTask.getTaskNo());
+//            jsonObject.put("farmType", farmType);
+//
+//            msgbatchContent.setAppRedirect("/fmsPages/farm/record", jsonObject);
+//
+//            List<String> managers = new ArrayList<>();
+//            managers.add(fmsTask.getTaskManager());
+//            messageContentService.sendMsg(title, msgbatchContent,null, type, fmsTask.getTaskId(), managers);
+//        }
 
 
         return ajaxResult;

src/main/java/com/yunfeiyun/agmp/fms/controller/TestController.java

@@ -1,149 +0,0 @@
-package com.yunfeiyun.agmp.fms.controller;
-
-
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
-import com.yunfeiyun.agmp.common.constant.ErrorCode;
-import com.yunfeiyun.agmp.common.core.domain.model.IBaseMenu;
-import com.yunfeiyun.agmp.common.core.domain.model.IBaseOperLog;
-import com.yunfeiyun.agmp.common.exception.BizException;
-import com.yunfeiyun.agmp.common.web.system.mapper.SysMenuMapper;
-import com.yunfeiyun.agmp.common.web.system.mapper.SysOperLogMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@RestController
-@RequestMapping("/test")
-@Slf4j
-public class TestController {
-
-    @Resource
-    private SysMenuMapper service;
-    @Resource
-    private SysOperLogMapper sysOperLogMapper;
-    /**
-     * 查询系统预警列表
-     */
-    @PreAuthorize("@ss.hasPermi('test:list')")
-    @GetMapping("/list")
-    public void list(String apiPostJsonUrl) throws ClassNotFoundException {
-        List<IBaseMenu> list =  service.selectMenuList(null);
-        List<IBaseOperLog> operLogs = sysOperLogMapper.selectOperLogList(null);
-        List<String> methodName = operLogs.stream().map(IBaseOperLog::getOperMethod).collect(Collectors.toList());
-        Map<String,IBaseMenu> menuMap = new HashMap<>();
-        for(IBaseMenu baseMenu : list){
-            menuMap.put("@ss.hasPermi('" + baseMenu.getMenuPerms() +"')",baseMenu);
-        }
-        String packageName = "com.yunfeiyun.fms.web.controller.system";  // 替换为你要扫描的包名
-        String packagePath = packageName.replace('.', '/');
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        URL packageURL = classLoader.getResource(packagePath);
-        File packageDir = new File(packageURL.getPath());
-        File[] classFiles = packageDir.listFiles();
-        List<String> fmsNoExistMenu = new ArrayList<>();
-        List<String> wmsNoExistMenu = new ArrayList<>();
-        List<String> pathJson = readJson(apiPostJsonUrl);
-        if (classFiles != null) {
-            for (File classFile : classFiles) {
-                String className = classFile.getName().replace(".class", "");
-                String fullClassName = packageName + "." + className;
-                Class<?> targetClass = Class.forName(fullClassName);
-                RequestMapping classMapping = targetClass.getAnnotation(RequestMapping.class);
-                String controllerPath = classMapping.value()[0];
-                Method[] methods = targetClass.getDeclaredMethods();
-                for (Method method : methods) {
-                    if(methodName.contains(fullClassName+"."+method.getName()+"()")){
-                        if (method.isAnnotationPresent(PreAuthorize.class)) {
-                            PreAuthorize annotation = method.getAnnotation(PreAuthorize.class);
-                            RequestMapping ReqMapping = method.getAnnotation(RequestMapping.class);
-                            GetMapping getMapping = method.getAnnotation(GetMapping.class);
-                            PostMapping postMapping = method.getAnnotation(PostMapping.class);
-                            DeleteMapping deleteMapping = method.getAnnotation(DeleteMapping.class);
-                            PutMapping putMapping = method.getAnnotation(PutMapping.class);
-                            String path = "";
-                            if(ReqMapping != null &&ReqMapping.value().length>0 ){
-                                path =  ReqMapping.value()[0];
-                            }else if(getMapping !=null&&getMapping.value().length>0 ) {
-                                path =  getMapping.value()[0];
-                            }else if(postMapping !=null &&postMapping.value().length>0) {
-                                path =postMapping.value()[0];
-                            }else if(deleteMapping !=null &&deleteMapping.value().length>0) {
-                                path =  deleteMapping.value()[0];
-                            }else if(putMapping !=null &&putMapping.value().length>0) {
-                                path =  putMapping.value()[0];
-                            }
-                            String methodPath  = controllerPath + path;
-                            String parameterValue = annotation.value();
-                            if(pathJson.contains(methodPath) && (menuMap.get(parameterValue)== null )){
-                                    log.info(methodPath + ","+parameterValue);
-
-                            }
-
-                        }
-                    }
-
-                }
-            }
-        }
-
-    }
-
-
-
-    private static List<String> readJson(String apiPostJsonUrl){
-        try (BufferedReader reader = new BufferedReader(new FileReader(apiPostJsonUrl))) {
-            StringBuilder jsonContent = new StringBuilder();
-            String line;
-            while ((line = reader.readLine()) != null) {
-                jsonContent.append(line);
-            }
-            List<String> pathArray = new ArrayList<>();
-            processJSONObject(JSONObject.parse(jsonContent.toString()),pathArray);
-            // 处理读取到的 JSON 内容
-           return pathArray;
-        } catch (IOException e) {
-           throw new BizException(ErrorCode.TSS_TRACE_CODE_TPL_NOT_EXIST);
-        }
-    }
-
-    public static void processJSONObject(JSONObject jsonObject,List<String> returnList) {
-        for (String key : jsonObject.keySet()) {
-            Object value = jsonObject.get(key);
-            if (value instanceof JSONObject) {
-                processJSONObject((JSONObject) value,returnList);
-            } else if (value instanceof JSONArray) {
-                processJSONArray((JSONArray) value,returnList);
-            } else {
-                if(key.equals("mock_url")){
-                    returnList.add(value.toString());
-                }
-            }
-        }
-    }
-
-    public static void processJSONArray(JSONArray jsonArray,List<String> returnList) {
-        for (int i = 0; i < jsonArray.size(); i++) {
-            Object item = jsonArray.get(i);
-            if (item instanceof JSONObject) {
-                processJSONObject((JSONObject) item,returnList);
-            } else if (item instanceof JSONArray) {
-                processJSONArray((JSONArray) item,returnList);
-            }
-        }
-    }
-
-}

src/main/java/com/yunfeiyun/agmp/fms/domain/reqvo/AddFmsTaskRecordReqVo.java

@@ -11,7 +11,6 @@ import java.util.List;
 
 /**
  * 农事任务对象 FmsTask
- * 
  * @author 杨晓辉
  * @date 2023-05-19
  */

src/main/java/com/yunfeiyun/agmp/fms/scheduler/FmsAcctempScheduler.java

@@ -2,22 +2,14 @@ package com.yunfeiyun.agmp.fms.scheduler;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.enums.CommonEnums;
-import com.yunfeiyun.agmp.common.exception.BizException;
-import com.yunfeiyun.agmp.common.utils.ConfigUtils;
+import com.yunfeiyun.agmp.common.service.WeatherService;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
-import com.yunfeiyun.agmp.common.utils.StringUtils;
-import com.yunfeiyun.agmp.common.utils.weather.WeatherReqVo;
-import com.yunfeiyun.agmp.common.utils.weather.WeatherUtil;
 import com.yunfeiyun.agmp.fms.controller.FmsAcctempController;
-import com.yunfeiyun.agmp.fms.domain.*;
+import com.yunfeiyun.agmp.fms.domain.AdsWeatherhour;
 import com.yunfeiyun.agmp.fms.domain.reqvo.AdsWeatherReqVo;
-import com.yunfeiyun.agmp.fms.domain.reqvo.FmsPlanReqVo;
-import com.yunfeiyun.agmp.fms.domain.resvo.FmsWeatherInfoResVo;
-import com.yunfeiyun.agmp.fms.service.*;
+import com.yunfeiyun.agmp.fms.service.IAdsWeatherhourService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -38,6 +30,9 @@ public class FmsAcctempScheduler {
     private FmsAcctempController fmsAcctempController;
     @Autowired
     private IAdsWeatherhourService adsWeatherhourService;
+
+    @Autowired
+    private WeatherService weatherService;
     
     /**
      * 每日新增积温数据
@@ -63,19 +58,7 @@ public class FmsAcctempScheduler {
     public void adsWeatherhourAddTask() throws Exception{
         log.info("每日新增每小时天气数据任务开始");
 
-        WeatherReqVo weatherReqVo;
-        JSONObject paramObj = new JSONObject();
-        try {
-            String param = ConfigUtils.ConfigKeyEnum.PROJECT_LOCATION_WEATHER_PARAM.valueOf();
-            paramObj = JSONObject.parseObject(param);
-            weatherReqVo = JSONObject.parseObject(param, WeatherReqVo.class);
-        }catch (Exception e){
-            throw new BizException(ErrorCode.WEATHER_PARAM_GET_ERROR);
-        }
-        FmsWeatherInfoResVo fmsWeatherInfoResVo = null;
-        weatherReqVo.setDay_type("1");
-        String result = WeatherUtil.getWeatherNearlySevenDays(weatherReqVo);
-        JSONObject resultObj = JSONObject.parseObject(result).getJSONObject("data").getJSONObject("content");
+        JSONObject resultObj = weatherService.getProjectWeather();
         JSONArray hours = resultObj.getJSONArray("hours");
         List<AdsWeatherhour> list = new ArrayList<>();
         LocalDate date = LocalDate.now();
@@ -103,9 +86,9 @@ public class FmsAcctempScheduler {
             adsWeatherhour.setWeatherhourWea(jsonObject.getString("wea"));
             adsWeatherhour.setWeatherhourWin(jsonObject.getString("win"));
             adsWeatherhour.setWeatherhourWinspeed(jsonObject.getString("win_speed"));
-            adsWeatherhour.setWeatherhourProvince(paramObj.getString("a"));
-            adsWeatherhour.setWeatherhourCity(paramObj.getString("b"));
-            adsWeatherhour.setWeatherhourDistrict(paramObj.getString("c"));
+            adsWeatherhour.setWeatherhourProvince(resultObj.getString("province"));
+            adsWeatherhour.setWeatherhourCity(resultObj.getString("city"));
+            adsWeatherhour.setWeatherhourDistrict(resultObj.getString("district"));
             adsWeatherhour.setWeatherhourCreateddate(DateUtils.dateTimeNow());
             list.add(adsWeatherhour);
         }

src/main/java/com/yunfeiyun/agmp/fms/scheduler/FmsWarnScheduler.java

@@ -1,17 +1,12 @@
 package com.yunfeiyun.agmp.fms.scheduler;
 
-import com.yunfeiyun.agmp.common.constant.PtsMsgBizType;
-import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
 import com.yunfeiyun.agmp.common.enums.WarnStatus;
-import com.yunfeiyun.agmp.common.framework.mq.MessageContentService;
-import com.yunfeiyun.agmp.common.framework.mq.MsgbatchContent;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
-import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.fms.domain.FmsWarn;
-import com.yunfeiyun.agmp.fms.mapper.FmsPlanMapper;
-import com.yunfeiyun.agmp.fms.mapper.FmsWarnMapper;
 import com.yunfeiyun.agmp.fms.domain.dto.FmsPlanByWarnSchedulerDto;
 import com.yunfeiyun.agmp.fms.domain.dto.FmsWarnBySchedulerDto;
+import com.yunfeiyun.agmp.fms.mapper.FmsPlanMapper;
+import com.yunfeiyun.agmp.fms.mapper.FmsWarnMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -19,7 +14,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
-import javax.annotation.Resource;
 import java.util.*;
 
 @Slf4j
@@ -30,8 +24,8 @@ public class FmsWarnScheduler {
 
     @Autowired
     private FmsPlanMapper fmsPlanMapper;
-    @Resource
-    private MessageContentService messageContentService;
+//    @Resource
+//    private MessageContentService messageContentService;
 
     @Transactional(rollbackFor = Exception.class)
     private void warnCreate(List<FmsWarn> fmsWarnList){
@@ -39,12 +33,12 @@ public class FmsWarnScheduler {
 
             this.fmsWarnMapper.insertFmsWarnBatch(fmsWarnList);
         }
-        for(FmsWarn fmsWarn: fmsWarnList){
-            MsgbatchContent msgbatchContent = new MsgbatchContent(fmsWarn.getWarnContent());
-            List<String> msgReceiverIds = fmsPlanMapper.selectBlockManagerByPlanId(fmsWarn.getPlanId(), SecurityUtils.getTid());
-//            messageContentService.sendMsg(fmsWarn.getWarnTitle(),msgbatchContent,null, PtsMsgBizType.FMS_WARN,null,msgReceiverIds);
-            messageContentService.sendMsg("农事预警通知", msgbatchContent,null, PtsMsgBizType.FMS_WARN,null,msgReceiverIds);
-        }
+//        for(FmsWarn fmsWarn: fmsWarnList){
+//            MsgbatchContent msgbatchContent = new MsgbatchContent(fmsWarn.getWarnContent());
+//            List<String> msgReceiverIds = fmsPlanMapper.selectBlockManagerByPlanId(fmsWarn.getPlanId(), SecurityUtils.getTid());
+////            messageContentService.sendMsg(fmsWarn.getWarnTitle(),msgbatchContent,null, PtsMsgBizType.FMS_WARN,null,msgReceiverIds);
+//            messageContentService.sendMsg("农事预警通知", msgbatchContent,null, PtsMsgBizType.FMS_WARN,null,msgReceiverIds);
+//        }
     }
     /**
      * 创建农事预警定时任务

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsTaskrcdServiceImpl.java

@@ -4,15 +4,12 @@ import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.constant.PtsMsgBizType;
 import com.yunfeiyun.agmp.common.constant.ResConstants;
-import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.domain.entity.PtsMsg;
 import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
 import com.yunfeiyun.agmp.common.enums.TaskStatus;
 import com.yunfeiyun.agmp.common.enums.TaskType;
 import com.yunfeiyun.agmp.common.enums.TaskrcdAuditStatus;
 import com.yunfeiyun.agmp.common.exception.BizException;
-import com.yunfeiyun.agmp.common.framework.mq.MessageContentService;
-import com.yunfeiyun.agmp.common.framework.mq.MsgbatchContent;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.MessageUtil;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
@@ -21,7 +18,6 @@ import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.common.web.system.domain.reqVo.PtsMessageListReqVo;
 import com.yunfeiyun.agmp.common.web.system.mapper.SysResMapper;
 import com.yunfeiyun.agmp.common.web.system.mapper.SysUserMapper;
-import com.yunfeiyun.agmp.fms.constant.Fms;
 import com.yunfeiyun.agmp.fms.domain.*;
 import com.yunfeiyun.agmp.fms.domain.resvo.*;
 import com.yunfeiyun.agmp.fms.mapper.*;
@@ -33,16 +29,13 @@ import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskassetVo;
 import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskmachineVo;
 import com.yunfeiyun.agmp.fms.domain.vo.FmsTaskrcdVo;
 import com.yunfeiyun.agmp.fms.service.IFmsTaskrcdService;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import javax.annotation.Resource;
-import java.lang.reflect.Array;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 农事任务提交记录Service业务层处理
@@ -65,8 +58,8 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
     private FmsTaskassetMapper fmsTaskassetMapper;
     @Resource
     private SysResMapper sysResMapper;
-    @Resource
-    private MessageContentService messageContentService;
+//    @Resource
+//    private MessageContentService messageContentService;
     @Resource
     private FmsBlockMapper fmsBlockMapper;
     @Resource
@@ -369,8 +362,8 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
                 manager.add(fmsBlockResVo.getBlockManager());
                 title = "农事审核待办";
             }
-            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
-            messageContentService.sendMsg(title,msgbatchContent,null, type, fmsTaskrcd.getTaskrcdId(), manager);
+//            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
+//            messageContentService.sendMsg(title,msgbatchContent,null, type, fmsTaskrcd.getTaskrcdId(), manager);
             PtsMessageListReqVo ptsMessageListReqVo = new PtsMessageListReqVo();
             ptsMessageListReqVo.setBizobj(fmsTask.getTaskId());
             ptsMessageListReqVo.setType(readType.getMsgbatchBiztype());
@@ -496,18 +489,20 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
                 throw new BizException(ErrorCode.INVALID_PARAMETER);
             }
 
-            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
+
 
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("id", fmsTask.getTaskId());
             jsonObject.put("taskNo", fmsTask.getTaskNo());
             jsonObject.put("farmType", farmType);
 
-            msgbatchContent.setAppRedirect(url, jsonObject);
+//            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
+//            msgbatchContent.setAppRedirect(url, jsonObject);
 
             List<String> managers = new ArrayList<>();
             managers.add(fmsTask.getTaskManager());
-            messageContentService.sendMsg(title, msgbatchContent,null, type, fmsTask.getTaskId(), managers);
+//            messageContentService.sendMsg(title, msgbatchContent,null, type, fmsTask.getTaskId(), managers);
+
             PtsMessageListReqVo ptsMessageListReqVo = new PtsMessageListReqVo();
             ptsMessageListReqVo.setBizobj(fmsTaskrcd.getTaskrcdId());
             ptsMessageListReqVo.setType(PtsMsgBizType.FMS_TASK_AUDIT_MSG_COMMON.getMsgbatchBiztype());

src/main/java/com/yunfeiyun/agmp/fms/service/impl/MppProductServiceImpl.java

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
-import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.domain.entity.SysDictData;
 import com.yunfeiyun.agmp.common.enums.CommonEnums;
 import com.yunfeiyun.agmp.common.enums.DictTypeEnums;
@@ -123,7 +122,7 @@ public class MppProductServiceImpl implements IMppProductService
         dict.setDictAvlstatus(CommonEnums.DICT_STATUS_NORMAL.getCode());
         dict.setDictCode(mppProduct.getProductType());
         //查询当前字典类型的数值的最大值
-        Integer max = dictDataMapper.maxValueByDictType(dict.getDicttypeCode());
+        Integer max = dictDataMapper.maxValueByDictType(dict.getDicttypeCode(), SecurityUtils.getTid());
         max = max == null ? 0 : max;
         if (StringUtils.isEmpty(dict.getDictValue())) {
             dict.setDictValue(String.valueOf(max+1));

src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsChangeapplyServiceImpl.java

@@ -4,13 +4,10 @@ import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.annotation.RedisLock;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.constant.PtsMsgBizType;
-import com.yunfeiyun.agmp.common.core.domain.bo.PtsMsgbatchBo;
 import com.yunfeiyun.agmp.common.core.domain.entity.PtsMsg;
-import com.yunfeiyun.agmp.common.core.domain.model.IBaseUser;
+import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
 import com.yunfeiyun.agmp.common.enums.*;
 import com.yunfeiyun.agmp.common.exception.BizException;
-import com.yunfeiyun.agmp.common.framework.mq.MessageContentService;
-import com.yunfeiyun.agmp.common.framework.mq.MsgbatchContent;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.MessageUtil;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
@@ -20,17 +17,16 @@ import com.yunfeiyun.agmp.fms.domain.WmsChange;
 import com.yunfeiyun.agmp.fms.domain.WmsChangeapply;
 import com.yunfeiyun.agmp.fms.domain.WmsChangeapplyitem;
 import com.yunfeiyun.agmp.fms.domain.WmsStock;
-import com.yunfeiyun.agmp.fms.domain.resvo.*;
-import com.yunfeiyun.agmp.fms.mapper.*;
-import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsChangeApplyAuditReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsChangeApplyGoodsListReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsChangeApplyListReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsChangeApplyReqVo;
+import com.yunfeiyun.agmp.fms.domain.resvo.*;
 import com.yunfeiyun.agmp.fms.domain.vo.WmsAssetgoodsVo;
+import com.yunfeiyun.agmp.fms.mapper.*;
 import com.yunfeiyun.agmp.fms.service.IWmsChangeapplyService;
+import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -62,8 +58,8 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
     private WmsAssetgoodsMapper wmsAssetgoodsMapper;
     @Resource
     private DataAuthUtil dataAuthUtil;
-    @Resource
-    private MessageContentService messageContentService;
+//    @Resource
+//    private MessageContentService messageContentService;
     @Resource
     private SysUserMapper sysUserMapper;
     @Resource
@@ -193,16 +189,17 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
                 changeapplyBiztype = "农资申领";
             }
             String context = changeapplyBiztype + "审核已拒绝，请注意查收。";
-            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
+
 
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("ratio", "-1");
 
-            msgbatchContent.setAppRedirect("/fmsPages/agricultural/AssetsDetailApply", jsonObject);
-
             List<String> managers = new ArrayList<>();
             managers.add(wmsChangeapply.getChangeapplyApplyer());
-            messageContentService.sendMsg("农资审核结果通知", msgbatchContent,null, PtsMsgBizType.FMS_WMS_GOODS_CHANGE_AUDIT_RESULT, wmsChangeApplyAuditReqVo.getChangeapplyId(), managers);
+
+//            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
+//            msgbatchContent.setAppRedirect("/fmsPages/agricultural/AssetsDetailApply", jsonObject);
+//            messageContentService.sendMsg("农资审核结果通知", msgbatchContent,null, PtsMsgBizType.FMS_WMS_GOODS_CHANGE_AUDIT_RESULT, wmsChangeApplyAuditReqVo.getChangeapplyId(), managers);
             PtsMessageListReqVo ptsMessageListReqVo = new PtsMessageListReqVo();
             ptsMessageListReqVo.setBizobj(wmsChangeapply.getChangeapplyId());
             ptsMessageListReqVo.setType(PtsMsgBizType.FMS_WMS_GOODS_CHANGE_AUDIT.getMsgbatchBiztype());
@@ -235,8 +232,6 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
             } else if (wmsChangeapply.getChangeapplyBiztype().contains("OUT")) {
                 changeapplyBiztype = "农资申领";
             }
-            String context = changeapplyBiztype + "审核已通过，请注意查收。";
-            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
 
             WmsChangeApplyGoodsListReqVo reqVo = new WmsChangeApplyGoodsListReqVo();
             reqVo.setChangeapplyId(wmsChangeapply.getChangeapplyId());
@@ -256,11 +251,15 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
             jsonObject.put("changeapplyitemUnitContent", resVo.getChangeapplyitemUnitContent());
             jsonObject.put("goodsName", resVo.getGoodsName());
 
-            msgbatchContent.setAppRedirect("/fmsPages/agricultural/AssetsDetailApplyDetail", jsonObject);
+
 
             List<String> managers = new ArrayList<>();
             managers.add(wmsChangeapply.getChangeapplyApplyer());
-            messageContentService.sendMsg("农资审核结果通知", msgbatchContent,null, PtsMsgBizType.FMS_WMS_GOODS_CHANGE_AUDIT_RESULT, wmsChangeApplyAuditReqVo.getChangeapplyId(), managers);
+
+//            String context = changeapplyBiztype + "审核已通过，请注意查收。";
+//            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
+//            msgbatchContent.setAppRedirect("/fmsPages/agricultural/AssetsDetailApplyDetail", jsonObject);
+//            messageContentService.sendMsg("农资审核结果通知", msgbatchContent,null, PtsMsgBizType.FMS_WMS_GOODS_CHANGE_AUDIT_RESULT, wmsChangeApplyAuditReqVo.getChangeapplyId(), managers);
             PtsMessageListReqVo ptsMessageListReqVo = new PtsMessageListReqVo();
             ptsMessageListReqVo.setBizobj(wmsChangeapply.getChangeapplyId());
             ptsMessageListReqVo.setType(PtsMsgBizType.FMS_WMS_GOODS_CHANGE_AUDIT.getMsgbatchBiztype());
@@ -357,10 +356,11 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
         if(result !=0 ){
 //            String context = "当前有农资" + bizType.getMessage()+ "事项需要审核,请查收";
             String context = "当前有农资申领/农资退还事项需要审核，请查收。";
-            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
-            List<IBaseUser> userList  = sysUserMapper.selectUserByRoleKey("warehouse_admin");
-            List<String> userIds = userList.stream().map(IBaseUser::getUserId).collect(Collectors.toList());
-            messageContentService.sendMsg("农资审核待办",msgbatchContent,null, PtsMsgBizType.FMS_WMS_GOODS_CHANGE_AUDIT,wmsChangeapply.getChangeapplyId(),userIds);
+
+            List<SysUser> userList  = sysUserMapper.selectUserByRoleKey("warehouse_admin");
+            List<String> userIds = userList.stream().map(SysUser::getUserId).collect(Collectors.toList());
+//            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
+//            messageContentService.sendMsg("农资审核待办",msgbatchContent,null, PtsMsgBizType.FMS_WMS_GOODS_CHANGE_AUDIT,wmsChangeapply.getChangeapplyId(),userIds);
 
         }
         return result;

src/main/java/com/yunfeiyun/agmp/fms/util/DataAuthUtil.java

@@ -1,9 +1,8 @@
 package com.yunfeiyun.agmp.fms.util;
 
-import com.yunfeiyun.agmp.common.core.domain.model.IBaseRole;
+import com.yunfeiyun.agmp.common.core.domain.entity.SysRole;
 import com.yunfeiyun.agmp.common.framework.web.service.ISysRoleService;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
-import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.fms.domain.FmsBlock;
 import com.yunfeiyun.agmp.fms.domain.FmsLand;
 import com.yunfeiyun.agmp.fms.service.IFmsBlockService;
@@ -11,13 +10,8 @@ import com.yunfeiyun.agmp.fms.service.IFmsLandService;
 import com.yunfeiyun.agmp.fms.service.IWmsWarehouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -91,8 +85,8 @@ public class DataAuthUtil
 
     public boolean checkRole(String roleKey){
         String userId = SecurityUtils.getUserId();
-        List<IBaseRole> iBaseRoles = sysRoleService.selectRolesByUserId(userId);
-        for (IBaseRole iBaseRole : iBaseRoles) {
+        List<SysRole> sysRoles = sysRoleService.selectRolesByUserId(userId);
+        for (SysRole iBaseRole : sysRoles) {
             if (iBaseRole.isFlag()&&roleKey.equals(iBaseRole.getRoleKey())) {
                 return true;
             }

src/main/java/com/yunfeiyun/agmp/fms/util/TraceTaasUtil.java

@@ -1,58 +1,23 @@
 package com.yunfeiyun.agmp.fms.util;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.fastjson2.JSONObject;
 import com.alipay.mychain.taas.api.common.VersionCode;
 import com.alipay.mychain.taas.api.common.phase.PhaseItem;
 import com.alipay.mychain.taas.api.common.phase.Uploader;
-import com.alipay.mychain.taas.api.enums.CodeTypeEnum;
-import com.alipay.mychain.taas.api.enums.PhaseDisplay;
-import com.alipay.mychain.taas.api.enums.PhaseItemTypeEnum;
-import com.alipay.mychain.taas.api.enums.PhaseType;
-import com.alipay.mychain.taas.api.enums.SystemCodeEnum;
-import com.alipay.mychain.taas.api.request.BatchesQueryReq;
-import com.alipay.mychain.taas.api.request.BatchesRegReq;
-import com.alipay.mychain.taas.api.request.PageReq;
-import com.alipay.mychain.taas.api.request.ProductModifyReq;
-import com.alipay.mychain.taas.api.request.ProductQueryReq;
-import com.alipay.mychain.taas.api.request.ProductRegReq;
-import com.alipay.mychain.taas.api.request.QrCodeReq;
-import com.alipay.mychain.taas.api.request.TraceCertQueryReq;
-import com.alipay.mychain.taas.api.request.TraceCodeRegReq;
-import com.alipay.mychain.taas.api.request.TraceInfoQueryReq;
+import com.alipay.mychain.taas.api.enums.*;
+import com.alipay.mychain.taas.api.request.*;
 import com.alipay.mychain.taas.api.request.stock.stockPhase.StockPhaseAddReq;
 import com.alipay.mychain.taas.api.request.stock.stockPhase.StockPhaseQueryReq;
 import com.alipay.mychain.taas.api.request.stock.stockPhase.StockPhaseUpChainReq;
-import com.alipay.mychain.taas.api.response.BatchesResp;
-import com.alipay.mychain.taas.api.response.CommonResp;
-import com.alipay.mychain.taas.api.response.PageResp;
-import com.alipay.mychain.taas.api.response.ProductSummaryResp;
-import com.alipay.mychain.taas.api.response.TraceCertResp;
-import com.alipay.mychain.taas.api.response.TraceInfoResp;
+import com.alipay.mychain.taas.api.response.*;
 import com.alipay.mychain.taas.api.response.stock.StockPhaseResp;
 import com.alipay.mychain.taas.common.client.TaasClient;
 import com.alipay.mychain.taas.common.factory.ServiceFactory;
-import com.alipay.mychain.taas.sdk.service.TraceCodeService;
-import com.alipay.mychain.taas.sdk.service.TraceCoreService;
-import com.alipay.mychain.taas.sdk.service.TraceProductService;
-import com.alipay.mychain.taas.sdk.service.TsBatchService;
-import com.alipay.mychain.taas.sdk.service.TsPhaseService;
+import com.alipay.mychain.taas.sdk.service.*;
 import com.yunfeiyun.agmp.common.constant.ResConstants;
 import com.yunfeiyun.agmp.common.framework.manager.ResManager;
-import com.yunfeiyun.agmp.common.utils.ConfigUtils;
+import com.yunfeiyun.agmp.common.service.LocationService;
+import com.yunfeiyun.agmp.common.service.modal.LocationAddressModel;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.ObjectUtil;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
@@ -66,11 +31,19 @@ import com.yunfeiyun.agmp.fms.domain.WmsFinishgoods;
 import com.yunfeiyun.agmp.fms.domain.reqvo.AgmTaskPickListReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.TarceTaasUpChainReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.WmsFinishgoodsListResVo;
-import com.yunfeiyun.agmp.fms.mapper.AgmTaskpickMapper;
-import com.yunfeiyun.agmp.fms.mapper.TssSourceinfoMapper;
-import com.yunfeiyun.agmp.fms.mapper.TssTracecodeapplyMapper;
-import com.yunfeiyun.agmp.fms.mapper.TssTracecodetplparamMapper;
-import com.yunfeiyun.agmp.fms.mapper.WmsFinishgoodsMapper;
+import com.yunfeiyun.agmp.fms.mapper.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 蚂蚁链上链工具类
@@ -113,10 +86,13 @@ public class TraceTaasUtil {
 	@Autowired
 	private AgmTaskpickMapper agmTaskpickMapper;
 
+	@Autowired
+	private LocationService locationService;
+
 	@Bean
 	public void init() {
 		if (null == client) {
-			String trace_config = configService.selectConfigValueByKey("trace_config");
+			String trace_config = configService.selectConfigValueByCommonKey("trace_config");
 			if (!StringUtils.isEmpty(trace_config)) {
 				Map<String, Object> configMap = JSONUtils.toMap(trace_config);
 				if (null != configMap.get("active") && "taas".equals(configMap.get("active"))) {
@@ -330,14 +306,15 @@ public class TraceTaasUtil {
 
 	/** 批次环节上链 */
 	private String upChainPhase(String phaseId) throws Exception {
-		String str = ConfigUtils.ConfigKeyEnum.PROJECT_LOCATION_WEATHER_PARAM.valueOf();
-		JSONObject jsonObject = JSONObject.parseObject(str);
+		LocationAddressModel locationAddressModel = locationService.getProjectLocation();
+		String lat = String.valueOf(locationAddressModel.getLat());
+		String lng = String.valueOf(locationAddressModel.getLng());
 
 		StockPhaseUpChainReq stockPhaseUpChainReq = new StockPhaseUpChainReq();
 		stockPhaseUpChainReq.setPhaseId(phaseId);
 		Uploader uploader = new Uploader();
 		uploader.identity(SecurityUtils.getLoginUser().getUsername()).certHash(merchantId)
-				.latitude(jsonObject.getString("lat")).longitude(jsonObject.getString("lng"))
+				.latitude(lat).longitude(lng)
 				.uploadTime(System.currentTimeMillis());
 		stockPhaseUpChainReq.setUploader(uploader);
 		CommonResp<String> txHash = tsPhaseService.upChain(stockPhaseUpChainReq);

src/main/resources/application-231-zhai.yml

@@ -52,6 +52,10 @@ user:
 
 # Spring配置
 spring:
+  # 关闭RabbitMq自动配置功能
+  autoconfigure:
+    exclude:
+      - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
   # 资源信息
   messages:
     # 国际化资源文件路径

src/main/resources/application-demo.yml

@@ -52,6 +52,10 @@ user:
 
 # Spring配置
 spring:
+  # 关闭RabbitMq自动配置功能
+  autoconfigure:
+    exclude:
+      - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
   # 资源信息
   messages:
     # 国际化资源文件路径

src/main/resources/application-dev.yml

@@ -52,6 +52,10 @@ user:
 
 # Spring配置
 spring:
+  # 关闭RabbitMq自动配置功能
+  autoconfigure:
+    exclude:
+      - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
   # 资源信息
   messages:
     # 国际化资源文件路径

src/main/resources/application-prod-demo.yml

@@ -52,6 +52,10 @@ user:
 
 # Spring配置
 spring:
+  # 关闭RabbitMq自动配置功能
+  autoconfigure:
+    exclude:
+      - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
   # 资源信息
   messages:
     # 国际化资源文件路径

src/main/resources/application-test.yml

@@ -52,6 +52,10 @@ user:
 
 # Spring配置
 spring:
+  # 关闭RabbitMq自动配置功能
+  autoconfigure:
+    exclude:
+      - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
   # 资源信息
   messages:
     # 国际化资源文件路径

src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
+    active: 231-zhai