户用光伏删除无用jar

amos-boot-system-jxiop/amos-boot-module-hygf-api/pom.xml

@@ -14,11 +14,11 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
     <dependencies>
-        <dependency>
-            <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-common-api</artifactId>
-            <version>${amos-biz-boot.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.amosframework.boot</groupId>-->
+<!--            <artifactId>amos-boot-module-common-api</artifactId>-->
+<!--            <version>${amos-biz-boot.version}</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/CommonResponseNewUtil.java

+package com.yeejoin.amos.boot.module.hygf.api.util;
+
+import org.springframework.http.HttpStatus;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import com.yeejoin.amos.boot.module.hygf.api.util.Constants;
+public class CommonResponseNewUtil
+{
+	public static ResponseModel success()
+	{	
+		ResponseModel res = new ResponseModel();
+        res.setDevMessage(Constants.RESULT_SUCCESS);
+        res.setStatus(HttpStatus.OK.value());
+		return res;
+	}
+
+	public static ResponseModel success(Object obj)
+	{	
+		ResponseModel res = new ResponseModel();
+        res.setResult(obj);
+        res.setDevMessage(Constants.RESULT_SUCCESS);
+        res.setStatus(HttpStatus.OK.value());
+		return res;
+	}
+
+	public static ResponseModel success(Object obj, String message)
+	{	
+		ResponseModel res = new ResponseModel();
+        res.setResult(obj);
+        res.setDevMessage(message);
+        res.setStatus(HttpStatus.OK.value());
+		return res;
+	}
+
+	public static ResponseModel failure()
+	{	
+		ResponseModel res = new ResponseModel();
+        res.setDevMessage(Constants.RESULT_FAILURE);
+        res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+		return res;
+	}
+
+	public static ResponseModel failure(String message)
+	{
+		ResponseModel res = new ResponseModel();
+        res.setDevMessage(Constants.RESULT_FAILURE);
+        res.setMessage(message);
+        res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+		return res;
+	}
+
+	public static ResponseModel failure(Object obj, String message)
+	{
+		ResponseModel res = new ResponseModel();
+        res.setResult(obj);
+        res.setDevMessage(Constants.RESULT_FAILURE);
+        res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+		return res;
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml

@@ -15,16 +15,21 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
-   <dependency>
-            <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-ugp-api</artifactId>
-            <version>${amos-biz-boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-common-biz</artifactId>
-            <version>${amos-biz-boot.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.amosframework.boot</groupId>-->
+<!--            <artifactId>amos-boot-module-ugp-api</artifactId>-->
+<!--            <version>${amos-biz-boot.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.amosframework.boot</groupId>-->
+<!--            <artifactId>amos-boot-module-common-biz</artifactId>-->
+<!--            <version>${amos-biz-boot.version}</version>-->
+<!--        </dependency>-->
+      <dependency>
+          <groupId>org.typroject</groupId>
+          <artifactId>tyboot-component-emq</artifactId>
+          <version>1.1.20</version>
+      </dependency>
         <dependency>
             <groupId>com.amosframework.boot</groupId>
             <artifactId>amos-boot-biz-common</artifactId>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.hwsms.SendSmsCode;
@@ -14,6 +13,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.CommerceInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.UnitInfoMapper;
+import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DealerReviewServiceImpl;
 import com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser;
 import com.yeejoin.amos.boot.module.standard.api.mapper.PublicAgencyUserMapper;
@@ -358,9 +358,9 @@ public class UnitInfoController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "判断用户号码是否存在", notes = "判断用户号码是否存在")
 	public ResponseModel hasExistPhone( @PathVariable(value = "phone") String phone) {
 		try {
-			return CommonResponseUtil.success(Privilege.agencyUserClient.checkLoginId(phone).getResult());
+			return CommonResponseNewUtil.success(Privilege.agencyUserClient.checkLoginId(phone).getResult());
 		} catch (Exception e) {
-			return CommonResponseUtil.failure("该手机号已经注册");
+			return CommonResponseNewUtil.failure("该手机号已经注册");
 		}
 	}
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java

@@ -6,27 +6,17 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
-import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.DealerReviewEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationNodeEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
 import com.yeejoin.amos.boot.module.hygf.api.fegin.PrivilegeFeginService;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IDealerReviewService;
-import com.yeejoin.amos.boot.module.hygf.api.service.IRegionalCompaniesService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IUnitInfoService;
 import com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser;
 import com.yeejoin.amos.boot.module.standard.api.mapper.PublicAgencyUserMapper;
-import com.yeejoin.amos.component.feign.config.TokenOperation;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;