重构部分功能模块

fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java

@@ -5,28 +5,21 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
-import com.mortals.framework.model.PageInfo;
-import com.mortals.framework.model.Result;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.feign.base.IApiBaseManagerFeign;
 import com.mortals.xhx.feign.base.pdu.DeptPdu;
 import com.mortals.xhx.feign.base.pdu.SitePdu;
-import com.mortals.xhx.feign.device.IApiDeviceFeign;
-import com.mortals.xhx.feign.device.pdu.DevicePdu;
 import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.module.home.pdu.HomeQueryPdu;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.service.MatterDatumService;
 import com.mortals.xhx.module.matter.service.MatterService;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,8 +35,6 @@ public class HomeController extends BaseJsonBodyController {
     @Autowired
     private IApiBaseManagerFeign iApiBaseManagerFeign;
     @Autowired
-    private IApiDeviceFeign iApiDeviceFeign;
-    @Autowired
     private MatterDatumService matterDatumService;
     @Autowired
     private MatterService matterService;
@@ -143,49 +134,6 @@ public class HomeController extends BaseJsonBodyController {
         return ret;
     }
 
-    @PostMapping({"device/list"})
-    @UnAuth
-    public Rest<Object> deviceList(@RequestBody DevicePdu queryPdu) {
-//        IUser user = this.getCurUser();
-//        if(user==null){
-//            throw new AppException("用户未登录");
-//        }
-        Rest<Object> ret = new Rest();
-        Map<String, Object> model = new HashMap();
-        String busiDesc = "查询站点设备列表" ;
-
-        int code=1;
-        try {
-
-            if(queryPdu.getSiteId()!=null){
-                String resp = iApiDeviceFeign.getDeviceByQuery(queryPdu);
-                ApiResp<JSONObject> apiResp = JSON.parseObject(resp, ApiResp.class);
-                if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
-                    throw new AppException("获取站点设备列表失败：" + apiResp.getMsg());
-                }
-                if(apiResp.getData().get("data")!=null) {
-                    model.put("data", apiResp.getData().get("data"));
-                    model.put("dict", apiResp.getData().get("dict"));
-                    model.put("pageInfo",apiResp.getData().get("pageInfo"));
-                }else {
-                    model.put("data", Collections.emptyList());
-                }
-            }else {
-                model.put("data", Collections.emptyList());
-            }
-            model.put("message_info", busiDesc + "成功");
-            this.recordSysLog(this.request, busiDesc + " 【成功】");
-        } catch (Exception var9) {
-            code = -1;
-            this.doException(this.request, busiDesc, model, var9);
-        }
-
-        ret.setCode(code);
-        ret.setData(model);
-        ret.setDict(model.get("dict"));
-        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
-        return ret;
-    }
 
     /**
      * 合成表单与模板