添加设备相关信息

common-lib/src/main/java/com/mortals/xhx/common/pdu/firm/FirmPdu.java

+package com.mortals.xhx.common.pdu.firm;
+import java.util.Date;
+import java.util.List;
+import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+/**
+* 设备生产厂商Pdu对象
+*
+* @author zxfei
+* @date 2023-06-21
+*/
+@Data
+public class FirmPdu extends BaseEntityLong {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 设备生产厂商名称
+    */
+    private String firmName;
+    /**
+    * 设备生产商编码
+    */
+    private String firmCode;
+    /**
+    * 备注
+    */
+    private String firmRemark;
+
+public void initAttrValue(){
+
+            this.firmName = "";
+
+            this.firmCode = "";
+
+            this.firmRemark = "";
+    }
+}
\ No newline at end of file

common-lib/src/main/java/com/mortals/xhx/feign/firm/IFirmFeign.java

+package com.mortals.xhx.feign.firm;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.firm.FirmPdu;
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.feign.IFeign;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+/**
+ * 设备生产厂商 Feign接口
+ * @author zxfei
+ * @date 2023-06-21
+ */
+@FeignClient(name = "", path = "", fallbackFactory = FirmFeignFallbackFactory.class)
+public interface IFirmFeign extends IFeign {
+
+
+    /**
+     * 查看设备生产厂商列表
+     *
+     * @param firmPdu
+     * @return
+     */
+    @PostMapping(value = "/firm/list")
+    Rest<RespData<List<FirmPdu>>> list(@RequestBody FirmPdu firmPdu);
+
+
+    /**
+     * 查看设备生产厂商
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/firm/info")
+    Rest<FirmPdu> info(@RequestParam(value = "id") Long id);
+
+    /**
+     * 删除设备生产厂商
+     *
+     * @param ids
+     * @return
+     */
+    @GetMapping(value = "/firm/delete")
+    Rest<Void> delete(Long[] ids,@RequestHeader("Authorization") String authorization);
+
+
+    /**
+     * 设备生产厂商保存更新
+     *
+     * @param firmPdu
+     * @return
+     */
+    @PostMapping(value = "/firm/save")
+    Rest<RespData<FirmPdu>> save(@RequestBody FirmPdu firmPdu,@RequestHeader("Authorization") String authorization);
+
+
+}
+
+
+@Slf4j
+@Component
+class FirmFeignFallbackFactory implements FallbackFactory<IFirmFeign> {
+    @Override
+    public IFirmFeign create(Throwable t) {
+        return new IFirmFeign() {
+            @Override
+            public Rest<RespData<List<FirmPdu>>> list(FirmPdu firmPdu) {
+               return Rest.fail("暂时无法获取设备生产厂商列表，请稍后再试!");
+            }
+
+            @Override
+            public Rest<FirmPdu> info(Long id) {
+               return Rest.fail("暂时无法获取设备生产厂商详细，请稍后再试!");
+            }
+
+            @Override
+            public Rest<Void> delete(Long[] ids, String authorization) {
+                return Rest.fail("暂时无法删除设备生产厂商，请稍后再试!");
+            }
+
+            @Override
+            public Rest<RespData<FirmPdu>> save(FirmPdu firmPdu, String authorization) {
+                return Rest.fail("暂时无法保存设备生产厂商，请稍后再试!");
+            }
+        };
+    }
+}
+
+
+
+
+
+
+
+

fill-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -7,9 +7,13 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.DeviceMethodEnum;
 import com.mortals.xhx.common.code.EnabledEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.pdu.LoginForm;
+import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.device.DeviceReq;
+import com.mortals.xhx.common.pdu.firm.FirmPdu;
 import com.mortals.xhx.feign.device.IDeviceFeign;
+import com.mortals.xhx.feign.firm.IFirmFeign;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -59,6 +63,8 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
 
     @Autowired
     private IDeviceFeign deviceFeign;
+    @Autowired
+    private IFirmFeign firmFeign;
     @Value("${token.loginName:'admin'}")
     private String loginName;
     @Value("${token.password:'admin'}")
@@ -74,6 +80,14 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         this.addDict(model, "deviceStatus", paramService.getParamBySecondOrganize("Device", "deviceStatus"));
         this.addDict(model, "source", paramService.getParamBySecondOrganize("Device", "source"));
         this.addDict(model, "enabled", EnabledEnum.getEnumMap());
+
+        Rest<RespData<List<FirmPdu>>> restList = firmFeign.list(new FirmPdu());
+        if (restList.getCode() == YesNoEnum.YES.getValue()) {
+            Map<String, String> firmMap = restList.getData().getData().stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getFirmName(), (o, n) -> n));
+            this.addDict(model, "deviceFirmId", firmMap);
+        } else {
+            this.addDict(model, "deviceFirmId", new JSONObject());
+        }
         super.init(model, context);
     }