消息页面修改

src/main/java/com/neotel/smfcore/core/message/rest/bean/dto/MessageDto.java

@@ -46,4 +46,11 @@ public class MessageDto implements Serializable {
 
 
     @ApiModelProperty(value = "操作人")
     @ApiModelProperty(value = "操作人")
     private String operator;
     private String operator;
+
+
+    @ApiModelProperty(value = "报警类型")
+    public String alarmType="";
+
+    @ApiModelProperty(value = "错误码")
+    public String alarmCode="";
 }
 }

src/main/java/com/neotel/smfcore/core/message/rest/bean/dto/MsgCountDto.java

@@ -17,9 +17,6 @@ public class MsgCountDto implements Serializable {
     @ApiModelProperty(value = "消息内容")
     @ApiModelProperty(value = "消息内容")
     private String msg;
     private String msg;
 
 
-    @ApiModelProperty(value = "消息分类")
-    private String alarmType;
-
     @ApiModelProperty(value = "参数")
     @ApiModelProperty(value = "参数")
     private String[] msgParams;
     private String[] msgParams;
 
 

src/main/java/com/neotel/smfcore/core/message/service/dao/impl/MessageDaoImpl.java

@@ -33,6 +33,7 @@ public class MessageDaoImpl extends AbstractBaseDao implements IMessageDao {
     @Override
     @Override
     public List<MsgCountDto> getParetoData(Criteria criteria) {
     public List<MsgCountDto> getParetoData(Criteria criteria) {
 
 
+        criteria.and("alarmType").exists(true);
         Aggregation agg = Aggregation.newAggregation(
         Aggregation agg = Aggregation.newAggregation(
                 Aggregation.match(criteria),
                 Aggregation.match(criteria),
                 Aggregation.group("alarmType").count().as("count")
                 Aggregation.group("alarmType").count().as("count")

src/main/java/com/neotel/smfcore/custom/micron1053/controller/MicronReportController.java

@@ -5,6 +5,7 @@ import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.base.IExcelDownLoad;
 import com.neotel.smfcore.common.base.IExcelDownLoad;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.init.DataInitManager;
 import com.neotel.smfcore.common.init.DataInitManager;
+import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.FileUtil;
 import com.neotel.smfcore.common.utils.FileUtil;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.core.device.bean.StatusBean;
 import com.neotel.smfcore.core.device.bean.StatusBean;
@@ -30,6 +31,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.util.unit.DataUnit;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
@@ -258,20 +260,69 @@ public class MicronReportController {
         log.info("eventLog 导出完成");
         log.info("eventLog 导出完成");
     }
     }
 
 
+    public List<String> getList() {
+
+        List<String> result = new ArrayList<>();
+        result.add("Axis.Interference");
+        result.add("Exception");
+        result.add("Device.SuddenStop");
+        result.add("Device.Userpause");
+        result.add("Axis.Openfail");
+        result.add("Device.Homereset.DoorHasreel");
+        result.add("Device.SafeProtected");
+        result.add("Device.DebugMode");
+        result.add("Axis.Alarm");
+        result.add("Device.FixtureHasMetrial");
+        result.add("Device.NetworkError");
+        result.add("Device.Info");
+        result.add("Device.DoorNoMetrial");
+        result.add("Device.Warning");
+        result.add("Device.DoorHasMetrial");
+        result.add("Device.Waitmsg");
+        result.add("Device.IOTimeout");
+        result.add("Device.WaitTimeout");
+        result.add("Device.HT.Overlimited");
+        result.add("Device.InStorageError");
+        return result;
+    }
+
 
 
     @ApiOperation("paretoChart:帕累托图")
     @ApiOperation("paretoChart:帕累托图")
     @GetMapping("/paretoChart")
     @GetMapping("/paretoChart")
     @AnonymousAccess
     @AnonymousAccess
     public List<MsgCountDto> paretoChart(MessageCriteria criteria,   HttpServletRequest request){
     public List<MsgCountDto> paretoChart(MessageCriteria criteria,   HttpServletRequest request){
+//        Criteria aa = Criteria.where("type").is("ERROR").and("alarmType").exists(true);
+//        List<String> result= getList();
+//        List<Message> messageList=messageManager.findByQuery(new Query(aa));
+//        for (Message m :
+//                messageList) {
+//            if(ObjectUtil.isNotEmpty(m.alarmCode)){
+//                Random r=new Random();
+//               int index= r.nextInt(100)%(result.size());
+//
+//               m.setAlarmType(result.get(index) );
+//               m.setMsg(result.get(index));
+//               messageManager.save(m);
+//            }
+//        }
+
         Criteria c = Criteria.where("type").is("ERROR");
         Criteria c = Criteria.where("type").is("ERROR");
         if (ObjectUtil.isNotEmpty(criteria.getDeviceName())) {
         if (ObjectUtil.isNotEmpty(criteria.getDeviceName())) {
             c.and("deviceName").is(criteria.getDeviceName());
             c.and("deviceName").is(criteria.getDeviceName());
         }
         }
-        if (criteria.getCreateDate() != null && criteria.getCreateDate().getFrom() != null) {
+
+        if (criteria.getCreateDate() != null && criteria.getCreateDate().getFrom() != null&&criteria.getCreateDate().getTo()!=null) {
+            String str = DateUtil.toDateString(criteria.getCreateDate().getTo(), "yyyy-MM-dd") + " " + "23:59:59";
+            Date to = DateUtil.toDate(str, "yyyy-MM-dd HH:mm:ss");
+            c.and("createDate").gte(criteria.getCreateDate().getFrom()).lte(to);
+        }
+       else if (criteria.getCreateDate() != null && criteria.getCreateDate().getFrom() != null) {
             c.and("createDate").gte(criteria.getCreateDate().getFrom());
             c.and("createDate").gte(criteria.getCreateDate().getFrom());
         }
         }
-        if (criteria.getCreateDate() != null && criteria.getCreateDate().getTo() != null) {
-            c.and("createDate").lte(criteria.getCreateDate().getTo());
+        else if (criteria.getCreateDate() != null && criteria.getCreateDate().getTo() != null) {
+            String str = DateUtil.toDateString(criteria.getCreateDate().getTo(), "yyyy-MM-dd") + " " + "23:59:59";
+            Date to = DateUtil.toDate(str, "yyyy-MM-dd HH:mm:ss");
+            c.and("createDate").lte(to);
         }
         }
         List<MsgCountDto> list = messageManager.getParetoData(c);
         List<MsgCountDto> list = messageManager.getParetoData(c);
 //        List<MessageDto> dtos=messageMapper.toDto(list);
 //        List<MessageDto> dtos=messageMapper.toDto(list);