优化代码

java110-bean/src/main/java/com/java110/dto/app/AppDto.java

@@ -34,6 +34,8 @@ public class AppDto extends PageDto implements Serializable {
     private String userId;
     private String whileListIp;
 
+    private long serviceCount;
+
 
     private Date createTime;
 
@@ -120,4 +122,12 @@ public class AppDto extends PageDto implements Serializable {
     public void setAppIds(String[] appIds) {
         this.appIds = appIds;
     }
+
+    public long getServiceCount() {
+        return serviceCount;
+    }
+
+    public void setServiceCount(long serviceCount) {
+        this.serviceCount = serviceCount;
+    }
 }

java110-db/src/main/resources/mapper/community/AppServiceDaoImplMapper.xml

@@ -156,4 +156,11 @@
             and t.while_list_ip= #{whileListIp}
         </if>
     </select>
+    <select id="queryAppsServiceData" parameterType="Map" resultType="Map">
+        select a.app_id appId,a.`name`,count(1) count from c_service t
+        inner join c_route r on t.service_id = r.service_id and r.status_cd = '0'
+        inner join c_app a on r.app_id = a.app_id and a.status_cd = '0'
+        group by a.app_id,a.`name`
+    </select>
+
 </mapper>

java110-interface/src/main/java/com/java110/intf/community/IAppInnerServiceSMO.java

@@ -71,4 +71,7 @@ public interface IAppInnerServiceSMO {
      */
     @RequestMapping(value = "/deleteApp", method = RequestMethod.POST)
     int deleteApp(@RequestBody AppDto appDto);
+
+    @RequestMapping(value = "/queryAppsServiceData", method = RequestMethod.POST)
+    List<AppDto> queryAppsServiceData(@RequestBody AppDto appDto);
 }

service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -71,6 +71,7 @@ public class AssetImportSMOImpl extends DefaultAbstractComponentSMO implements I
     @Override
     public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        paramIn.put("userId", pd.getUserId());
         Assert.hasKeyAndValue(paramIn, "importAdapt", "未包含模板");
         String importAdapt = paramIn.getString("importAdapt") + "DataCleaning";
 
@@ -81,6 +82,7 @@ public class AssetImportSMOImpl extends DefaultAbstractComponentSMO implements I
         }
         try {
             ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+            paramIn.put("storeId", result.getStoreId());
 
             Workbook workbook = null;  //工作簿
             //工作表

service-community/src/main/java/com/java110/community/dao/IAppServiceDao.java

@@ -74,4 +74,5 @@ public interface IAppServiceDao {
      */
     int queryAppsCount(Map info);
 
+    List<Map> queryAppsServiceData(Map info);
 }

service-community/src/main/java/com/java110/community/dao/impl/AppServiceDaoImpl.java

@@ -121,5 +121,12 @@ public class AppServiceDaoImpl extends BaseServiceDao implements IAppServiceDao
         return Integer.parseInt(businessAppInfos.get(0).get("count").toString());
     }
 
+    @Override
+    public List<Map> queryAppsServiceData(Map info) {
+        List<Map> infos = sqlSessionTemplate.selectList("appServiceDaoImpl.queryAppsServiceData",info);
+
+        return infos;
+    }
+
 
 }

service-community/src/main/java/com/java110/community/smo/impl/AppInnerServiceSMOImpl.java

@@ -99,6 +99,14 @@ public class AppInnerServiceSMOImpl extends BaseServiceSMO implements IAppInnerS
         return appServiceDaoImpl.updateAppInfo(BeanConvertUtil.beanCovertMap(appDto));
     }
 
+    @Override
+    public List<AppDto> queryAppsServiceData(@RequestBody AppDto appDto) {
+        List<AppDto> apps = BeanConvertUtil.covertBeanList(appServiceDaoImpl.queryAppsServiceData(BeanConvertUtil.beanCovertMap(appDto)), AppDto.class);
+
+
+        return apps;
+    }
+
     public IAppServiceDao getAppServiceDaoImpl() {
         return appServiceDaoImpl;
     }

service-report/src/main/java/com/java110/report/cmd/admin/QueryAppServiceDataCmd.java

@@ -0,0 +1,53 @@
+package com.java110.report.cmd.admin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.app.AppDto;
+import com.java110.dto.store.StoreDto;
+import com.java110.intf.community.IAppInnerServiceSMO;
+import com.java110.intf.store.IStoreInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.ParseException;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "admin.queryAppServiceData")
+public class QueryAppServiceDataCmd extends Cmd {
+
+    @Autowired
+    private IStoreInnerServiceSMO storeInnerServiceSMOImpl;
+
+    @Autowired
+    private IAppInnerServiceSMO appInnerServiceSMOImpl;
+
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        String storeId = CmdContextUtils.getStoreId(context);
+
+        StoreDto storeDto = new StoreDto();
+        storeDto.setStoreId(storeId);
+        storeDto.setStoreTypeCd(StoreDto.STORE_TYPE_DEV);
+        int count = storeInnerServiceSMOImpl.getStoreCount(storeDto);
+        if (count < 1) {
+            throw new CmdException("非法操作，请用系统管理员账户操作");
+        }
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        AppDto appDto = new AppDto();
+        List<AppDto> appDtos = appInnerServiceSMOImpl.queryAppsServiceData(appDto);
+
+        context.setResponseEntity(ResultVo.createResponseEntity(appDtos));
+    }
+}

service-report/src/main/java/com/java110/report/cmd/dev/QueryDevCountCmd.java

@@ -1,4 +1,4 @@
-package com.java110.report.cmd.dev;
+package com.java110.report.cmd.admin;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
@@ -16,6 +16,7 @@ import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.repair.RepairDto;
 import com.java110.dto.room.RoomDto;
+import com.java110.dto.service.RouteDto;
 import com.java110.dto.service.ServiceDto;
 import com.java110.dto.shop.ShopDto;
 import com.java110.dto.store.StoreDto;
@@ -50,6 +51,9 @@ public class QueryDevCountCmd extends Cmd {
     @Autowired
     private IAppInnerServiceSMO appInnerServiceSMOImpl;
 
+    @Autowired
+    private IRouteInnerServiceSMO routeInnerServiceSMOImpl;
+
     @Autowired
     private IServiceInnerServiceSMO serviceInnerServiceSMOImpl;
 
@@ -88,6 +92,11 @@ public class QueryDevCountCmd extends Cmd {
         int storeCount = serviceInnerServiceSMOImpl.queryServicesCount(serviceDto);
         setDatas(datas, "接口数", storeCount);
 
+        //todo 服务注册
+        RouteDto routeDto = new RouteDto();
+        int routeCount =  routeInnerServiceSMOImpl.queryRoutesCount(routeDto);
+        setDatas(datas, "服务注册数", routeCount);
+
         //todo 定时任务
         TaskDto taskDto = new TaskDto();
         int taskCount = taskV1InnerServiceSMOImpl.queryTasksCount(taskDto);