优化 子服务架构

java110-interface/src/main/java/com/java110/intf/common/appraise/ISaveAppraiseService.java

@@ -7,12 +7,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-/**
- * 保存评价接口类
- */
 @FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/appraise")
-public interface ISaveAppraiseService {
+public interface IAppraiseApi {
 
     /**
      * 保存接口评价

java110-interface/src/main/java/com/java110/intf/community/repair/IAppraiseRepairService.java

@@ -6,17 +6,12 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
 
-/**
- * 保存评价接口类
- */
 @FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/repair")
-public interface IAppraiseRepairService {
-
+public interface IRepairApi {
     /**
-     * 保存接口评价
+     * 报修评价
      * @param appraiseDto
      * @return
      */

service-api/src/main/java/com/java110/api/listener/machineTranslate/MachineQueryUserInfoListener.java

@@ -153,8 +153,10 @@ public class MachineQueryUserInfoListener extends BaseMachineListener {
                 break;
             case TYPE_APPLICATION_KEY:
                 machineUserResultDto = applicationKeyMachineTranslateBMOImpl.getPhotoInfo(reqJson);
+                break;
             case TYPE_VISIT:
                 machineUserResultDto = visitMachineTranslateBMOImpl.getPhotoInfo(reqJson);
+                break;
             case TYPE_STAFF:
                 machineUserResultDto = staffMachineTranslateBMOImpl.getPhotoInfo(reqJson);
             default:

service-common/src/main/java/com/java110/common/api/AppraiseApi.java

@@ -0,0 +1,20 @@
+package com.java110.common.api;
+
+import com.java110.common.service.appraise.ISaveAppraiseService;
+import com.java110.dto.appraise.AppraiseDto;
+import com.java110.intf.common.appraise.IAppraiseApi;
+import com.java110.intf.community.repair.IRepairApi;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class AppraiseApi implements IAppraiseApi {
+    @Autowired
+    private ISaveAppraiseService saveAppraiseServiceImpl;
+
+    @Override
+    public AppraiseDto saveAppraise(@RequestBody AppraiseDto appraiseDto) {
+        return saveAppraiseServiceImpl.saveAppraise(appraiseDto);
+    }
+}

service-common/src/main/java/com/java110/common/service/appraise/ISaveAppraiseService.java

@@ -0,0 +1,22 @@
+package com.java110.common.service.appraise;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.appraise.AppraiseDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * 保存评价接口类
+ */
+
+public interface ISaveAppraiseService {
+
+    /**
+     * 保存接口评价
+     * @param appraiseDto
+     * @return
+     */
+    public AppraiseDto saveAppraise(AppraiseDto appraiseDto);
+}

service-common/src/main/java/com/java110/common/service/appraise/SaveAppraiseServiceImpl.java

@@ -1,18 +1,19 @@
-package com.java110.common.service.appraise;
+package com.java110.common.service.appraise.impl;
 
 import com.java110.common.dao.IAppraiseServiceDao;
+import com.java110.common.service.appraise.ISaveAppraiseService;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.appraise.AppraiseDto;
-import com.java110.intf.common.appraise.ISaveAppraiseService;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-@RestController
+@Service("saveAppraiseServiceImpl")
 public class SaveAppraiseServiceImpl implements ISaveAppraiseService {
 
     @Autowired
@@ -38,7 +39,7 @@ public class SaveAppraiseServiceImpl implements ISaveAppraiseService {
 
     @Override
     @Java110Transactional
-    public AppraiseDto saveAppraise(@RequestBody AppraiseDto appraiseDto) {
+    public AppraiseDto saveAppraise(AppraiseDto appraiseDto) {
         validate(appraiseDto);
         if (StringUtil.isEmpty(appraiseDto.getAppraiseId())|| appraiseDto.getAppraiseId().startsWith("-")) {
             appraiseDto.setAppraiseId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appraiseId));

service-community/src/main/java/com/java110/community/api/RepairApi.java

@@ -0,0 +1,27 @@
+package com.java110.community.api;
+
+import com.java110.community.service.repair.IAppraiseRepairService;
+import com.java110.dto.appraise.AppraiseDto;
+import com.java110.intf.community.repair.IRepairApi;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 报修 控制类
+ */
+@RestController
+public class RepairApi implements IRepairApi {
+    @Autowired
+    private IAppraiseRepairService appraiseRepairServiceImpl;
+
+    /**
+     * 对外 报修评价
+     * @param appraiseDto
+     * @return
+     */
+    @Override
+    public AppraiseDto appraiseRepair(@RequestBody AppraiseDto appraiseDto) {
+        return appraiseRepairServiceImpl.appraiseRepair(appraiseDto);
+    }
+}

service-community/src/main/java/com/java110/community/service/repair/IAppraiseRepairService.java

@@ -0,0 +1,22 @@
+package com.java110.community.service.repair;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.appraise.AppraiseDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * 保存评价接口类
+ */
+public interface IAppraiseRepairService {
+
+    /**
+     * 保存接口评价
+     * @param appraiseDto
+     * @return
+     */
+    public AppraiseDto appraiseRepair(AppraiseDto appraiseDto);
+}

service-community/src/main/java/com/java110/community/service/repair/AppraiseRepairServiceImpl.java

@@ -1,17 +1,17 @@
-package com.java110.community.service.repair;
+package com.java110.community.service.repair.impl;
 
 import com.java110.community.dao.IRepairServiceDao;
 import com.java110.community.dao.IRepairUserServiceDao;
+import com.java110.community.service.repair.IAppraiseRepairService;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.dto.appraise.AppraiseDto;
 import com.java110.dto.repair.RepairDto;
 import com.java110.dto.repair.RepairUserDto;
-import com.java110.intf.common.appraise.ISaveAppraiseService;
-import com.java110.intf.community.repair.IAppraiseRepairService;
+import com.java110.intf.common.appraise.IAppraiseApi;
 import com.java110.utils.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,11 +20,11 @@ import java.util.Map;
 /**
  * 报修评价
  */
-@RestController
+@Service("appraiseRepairServiceImpl")
 public class AppraiseRepairServiceImpl implements IAppraiseRepairService {
 
     @Autowired
-    private ISaveAppraiseService saveAppraiseServiceImpl;
+    private IAppraiseApi appraiseApi;
     @Autowired
     private IRepairServiceDao repairServiceDaoImpl;
 
@@ -42,6 +42,7 @@ public class AppraiseRepairServiceImpl implements IAppraiseRepairService {
         info.put("state", RepairUserDto.STATE_DOING);
         info.put("endTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         info.put("context", "评价完成");
+        info.put("statusCd","0");
         repairUserServiceDaoImpl.updateRepairUserInfoInstance(info);
         //将工单表的状态修改为完成
         info = new HashMap();
@@ -55,7 +56,7 @@ public class AppraiseRepairServiceImpl implements IAppraiseRepairService {
         appraiseDto.setParentAppraiseId("-1");
         appraiseDto.setObjType(AppraiseDto.OBJ_TYPE_REPAIR);
         appraiseDto.setAppraiseType(AppraiseDto.APPRAISE_TYPE_PUBLIC);
-        return saveAppraiseServiceImpl.saveAppraise(appraiseDto);
+        return appraiseApi.saveAppraise(appraiseDto);
 
     }
 }