修改技术参数接口

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/common/restful/utils/ApplicationContextUtils.java

+package com.yeejoin.amos.api.common.restful.utils;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * 手动注入bean
+ * @author andrew
+ *
+ */
+@Component
+public class ApplicationContextUtils implements ApplicationContextAware {
+    @Autowired
+    private static ApplicationContext context;
+
+    //方式一:传Class对象
+    //新建对象实例并注入其他springbean
+    public static <T> T newAutoWiredInstance(Class<T> beanClass){
+        return (T)context.getAutowireCapableBeanFactory()
+                .autowire(beanClass, AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT, true);
+    }
+
+    //方式二:传bean对象
+    //已经new出来的对象进行注入
+    public static <T> T autowire(T bean){
+        context.getAutowireCapableBeanFactory()
+                .autowireBeanProperties(bean, AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT, true);
+        return bean;
+    }
+
+    /**
+     * 插入ApplicationContext
+     */
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        context = applicationContext;
+    }
+    /**
+     * 获取ApplicationContext
+     */
+    public static ApplicationContext getApplicationContext() {
+        return context;
+    }
+
+
+    /**
+     * 通过name获取 Bean
+     */
+    public static Object getBean(String name) {
+        return getApplicationContext().getBean(name);
+    }
+
+
+    /**
+     * 通过class获取Bean.
+     */
+    public static <T> T getBean(Class<T> clazz) {
+        return getApplicationContext().getBean(clazz);
+    }
+
+    /**
+     *通过name,以及Clazz返回指定的Bean
+     */
+    public static <T> T getBean(String name, Class<T> clazz) {
+        return getApplicationContext().getBean(name, clazz);
+    }
+
+}
+

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamBoilerService.java

@@ -5,6 +5,5 @@ import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamBoilerMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamBoiler;
 import org.springframework.stereotype.Service;
 
-@Service
 public class EquipTechParamBoilerService extends AppBaseService<EquipTechParamBoilerModel, EquipTechParamBoiler, EquipTechParamBoilerMapper>{
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamElevatorService.java

@@ -4,6 +4,5 @@ import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamElevatorMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamElevator;
 import org.springframework.stereotype.Service;
 
-@Service
 public class EquipTechParamElevatorService extends AppBaseService<EquipTechParamElevatorMapper, EquipTechParamElevator,EquipTechParamElevatorMapper> {
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamLiftingService.java

@@ -5,6 +5,5 @@ import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamLiftingMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamLifting;
 import org.springframework.stereotype.Service;
 
-@Service
 public class EquipTechParamLiftingService extends AppBaseService<EquipTechParamLiftingModel, EquipTechParamLifting, EquipTechParamLiftingMapper> {
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamPipelineService.java

@@ -5,6 +5,5 @@ import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamPipelineMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamPipeline;
 import org.springframework.stereotype.Service;
 
-@Service
 public class EquipTechParamPipelineService extends AppBaseService<EquipTechParamPipelineModel, EquipTechParamPipeline, EquipTechParamPipelineMapper>{
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamRidesService.java

@@ -5,6 +5,5 @@ import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamRidesMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRides;
 import org.springframework.stereotype.Service;
 
-@Service
 public class EquipTechParamRidesService extends AppBaseService<EquipTechParamRidesModel, EquipTechParamRides, EquipTechParamRidesMapper>{
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamRopewayService.java

@@ -5,6 +5,6 @@ import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamRopewayMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRopeway;
 import org.springframework.stereotype.Service;
 
-@Service
+
 public class EquipTechParamRopewayService extends AppBaseService<EquipTechParamRopewayModel, EquipTechParamRopeway, EquipTechParamRopewayMapper> {
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamVehicleService.java

@@ -5,6 +5,5 @@ import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamVehicleMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamVehicle;
 import org.springframework.stereotype.Service;
 
-@Service
 public class EquipTechParamVehicleService extends AppBaseService<EquipTechParamVehicleModel, EquipTechParamVehicle,EquipTechParamVehicleMapper>{
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamVesselService.java

@@ -5,6 +5,5 @@ import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamVesselMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamVessel;
 import org.springframework.stereotype.Service;
 
-@Service
 public class EquipTechParamVesselService extends AppBaseService<EquipTechParamVesselModel, EquipTechParamVessel, EquipTechParamVesselMapper>{
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TechInfoService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.api.openapi.face.service;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.common.restful.utils.ApplicationContextUtils;
 import com.yeejoin.amos.api.openapi.constant.Constant;
 import com.yeejoin.amos.api.openapi.enums.EquipTypeEnum;
 import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
@@ -9,9 +10,11 @@ import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamBoilerMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractEquipBaseEntity;
 import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRopeway;
 import net.sf.json.JSONObject;
+import org.apache.catalina.core.ApplicationContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.context.support.UiApplicationContextUtils;
 import org.typroject.tyboot.component.cache.Redis;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -24,46 +27,15 @@ import java.util.Map;
 @Service
 public class TechInfoService {
 
-    @Autowired
-    EquipTechParamBoilerService boilerService;
-    @Autowired
-    EquipTechParamElevatorService elevatorService;
-    @Autowired
-    EquipTechParamLiftingService liftingService;
-    @Autowired
-    EquipTechParamPipelineService pipelineService;
-    @Autowired
-    EquipTechParamRopewayService ropewayService;
-    @Autowired
-    EquipTechParamRidesService ridesService;
-    @Autowired
-    EquipTechParamVehicleService vehicleService;
-    @Autowired
-    EquipTechParamVesselService vesselService;
-
-
-
-    public Map<String,Object> getServiceMap() {
-        Map<String,Object> serviceMap = new HashMap<>();
-        serviceMap.put(EquipTypeEnum.boiler.getType(),boilerService);
-        serviceMap.put(EquipTypeEnum.elevator.getType(),elevatorService);
-        serviceMap.put(EquipTypeEnum.lifting.getType(),liftingService);
-        serviceMap.put(EquipTypeEnum.pipeline.getType(),pipelineService);
-        serviceMap.put(EquipTypeEnum.ropeway.getType(),ropewayService);
-        serviceMap.put(EquipTypeEnum.rides.getType(),ridesService);
-        serviceMap.put(EquipTypeEnum.vehicle.getType(),vehicleService);
-        serviceMap.put(EquipTypeEnum.vessel.getType(),vesselService);
-        return serviceMap;
-    }
-
     public String saveTechInfo(List<JSONObject> techInfoList){
-        Map<String,Object> map = getServiceMap();
         for (JSONObject techInfo: techInfoList) {
             String type = techInfo.getString("type");
-            BaseService service = (BaseService)map.get(type);
             String entityClasspath = EquipTypeEnum.classPathmap.get(type);
+            String serviceClasspath = EquipTypeEnum.servicePathmap.get(type);
             try {
                 Class entityClazz = Class.forName(entityClasspath);
+                Class serviceClazz = Class.forName(serviceClasspath);
+                BaseService service = (BaseService) ApplicationContextUtils.newAutoWiredInstance(serviceClazz);
                 AbstractEquipBaseEntity entity = (AbstractEquipBaseEntity) JSON.parseObject(JSON.toJSONString(techInfo),entityClazz);
                 entity.setRecDate(new Date());
                 entity.setAppId(getAppId());
@@ -79,13 +51,13 @@ public class TechInfoService {
     @Autowired
     private RedisTemplate redisTemplate;
 
-    public String getAppId() {
-        String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX, RequestContext.getToken());
-        BizTokenModel bizTokenModel = (BizTokenModel) redisTemplate.opsForValue().get(tokenKey);
-        return bizTokenModel.getAppId();
-    }
-
 //    public String getAppId() {
-//        return "HSICIOWOC";
+//        String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX, RequestContext.getToken());
+//        BizTokenModel bizTokenModel = (BizTokenModel) redisTemplate.opsForValue().get(tokenKey);
+//        return bizTokenModel.getAppId();
 //    }
+
+    public String getAppId() {
+        return "HSICIOWOC";
+    }
 }