修改热门词汇

fill-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

@@ -46,6 +46,7 @@ public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, Device
 
         String productName = GlobalSysInfo.getParamValue(Constant.PARAMS_PRODUCT_NAME, "填单机");
         devicePdu.setProductName(productName);
+        devicePdu.setSiteId(entity.getSiteId());
 
         Rest<RespData<List<DevicePdu>>> rest = deviceFeign.list(devicePdu);
         if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
@@ -55,10 +56,12 @@ public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, Device
                 return deviceEntity;
             }).collect(Collectors.toList());
 
+
+
             result.setList(collect);
             result.setDict(rest.getDict());
         }
+        this.findAfter(entity, pageInfo, context, result.getList());
         return result;
-
     }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.device.web;
 
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.service.DeviceService;
@@ -7,6 +11,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * 设备
  *
@@ -19,4 +25,9 @@ import org.springframework.web.bind.annotation.RestController;
 public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceService, DeviceEntity, Long> {
 
 
+    @Override
+    protected int doListAfter(DeviceEntity query, Map<String, Object> model, Context context) throws AppException {
+        log.info("result:{}", JSON.toJSONString(model));
+        return super.doListAfter(query, model, context);
+    }
 }
\ No newline at end of file