新增销售排行

src/main/java/com/shawn/repository/TAlarmRecordMapper.java

@@ -16,5 +16,5 @@ import java.util.List;
 public interface TAlarmRecordMapper extends BaseDaoInterface<TAlarmRecord,TAlarmRecordExample,TAlarmRecordParam, Long>{
 
     public List<TAlarmRecord> getLastAlarmRecord(@Param("adminId") Long adminId);
-    public List<TAlarmRecord> getAlarmList(@Param("equipmentId") Long equipmentId);
+    public List<TAlarmRecord> getAlarmList(@Param("adminId") Long adminId);
 }

src/main/java/com/shawn/repository/TOrderMapper.java

@@ -22,4 +22,11 @@ public interface TOrderMapper extends BaseDaoInterface<TOrder,TOrderExample,TOrd
     public List<ChartBean> getYearStatistics(StatisticsParam param);
 
     public List<ChartBean> getMainStatistics(StatisticsParam param);
+
+    /**
+     *  统计 机器销售
+     * @param param
+     * @return
+     */
+    public List<ChartBean> getEquipmentStatistics(StatisticsParam param);
 }

src/main/java/com/shawn/service/impl/TAlarmRecordServiceImpl.java

@@ -36,7 +36,7 @@ public class TAlarmRecordServiceImpl extends BaseService<TAlarmRecord,TAlarmReco
 		return tAlarmRecordMapper.getLastAlarmRecord(adminId);
 	}
 	@Override
-	public List<TAlarmRecord> getAlarmList(Long equipmentId){
-		return tAlarmRecordMapper.getAlarmList(equipmentId);
+	public List<TAlarmRecord> getAlarmList(Long adminId){
+		return tAlarmRecordMapper.getAlarmList(adminId);
 	}
 }

src/main/java/com/shawn/service/impl/TOrderServiceImpl.java

@@ -75,4 +75,33 @@ public class TOrderServiceImpl extends BaseService<TOrder,TOrderExample,TOrderPa
 		}
 		return list;
 	}
+
+	/**
+	 *  统计 机器销售
+	 * @param param
+	 * @return
+	 */
+	@Override
+	public ChartColumn getEquipmentStatistics(StatisticsParam param){
+		List<ChartBean> list = new ArrayList<>();
+		String msg = "";
+		if(ChartType.day.toString().equals(param.getChartType())){
+			msg = "日统计";
+		}
+		if(ChartType.week.toString().equals(param.getChartType())){
+			msg = "周统计";
+		}
+		if(ChartType.month.toString().equals(param.getChartType())){
+			msg = "月统计";
+		}
+		if(ChartType.year.toString().equals(param.getChartType())){
+			msg = "年统计";
+		}
+		list = tOrderMapper.getEquipmentStatistics(param);
+		if(CollectionUtils.isEmpty(list)){
+			throw new MyException("获取"+msg+"数据为空");
+		}
+		ChartColumn chartColumn = new ChartColumn(list);
+		return chartColumn;
+	}
 }

src/main/java/com/shawn/service/interfac/TAlarmRecordServiceInterface.java

@@ -13,6 +13,6 @@ import com.shawn.service.base.BaseServiceInterface;
 import java.util.List;
 
 public interface TAlarmRecordServiceInterface extends BaseServiceInterface<TAlarmRecord,TAlarmRecordExample,TAlarmRecordParam,Long>{
-    public List<TAlarmRecord> getLastAlarmRecord(Long clientId);
-    public List<TAlarmRecord> getAlarmList(Long clientId);
+    public List<TAlarmRecord> getLastAlarmRecord(Long adminId);
+    public List<TAlarmRecord> getAlarmList(Long adminId);
 }

src/main/java/com/shawn/service/interfac/TOrderServiceInterface.java

@@ -20,4 +20,10 @@ public interface TOrderServiceInterface extends BaseServiceInterface<TOrder,TOrd
     public ChartColumn getStatistics(StatisticsParam param);
     public List<ChartBean> getMainStatistics(StatisticsParam param);
 
+    /**
+     *  统计 机器销售
+     * @param param
+     * @return
+     */
+    public ChartColumn getEquipmentStatistics(StatisticsParam param);
 }

src/main/java/com/shawn/web/controller/TEquipmentController.java

@@ -65,6 +65,8 @@ public class TEquipmentController extends BaseController<TEquipment,TEquipmentEx
 			List<TAdmin> adminList = tAdminService.selectByOption(null);
 			List<TEquipment> equipmentList = tEquipmentService.selectByOption(null);
 			List<TAlarmRecord> alarmRecordList = tAlarmRecordService.getLastAlarmRecord(null);
+			//获取当前用户今天所有机器的所以警报信息
+			List<TAlarmRecord> alarmList = tAlarmRecordService.getAlarmList(null);
 
 			resultList = adminList.stream().map(e ->{
 				TAdminDTO dto = new TAdminDTO();
@@ -79,10 +81,10 @@ public class TEquipmentController extends BaseController<TEquipment,TEquipmentEx
 							if(op.isPresent()){
 								equipmentDTO.setAlarmContent(op.get().getAlarmContent());
 								equipmentDTO.setOccurrenceTime(op.get().getOccurrenceTime());
-								//获取当前用户今天所有机器的所以警报信息
-								List<TAlarmRecord> alarmList = tAlarmRecordService.getAlarmList(equipment.getId());
-								equipmentDTO.setAlarmList(alarmList);
 							}
+							//获取该机器的所有警报信息
+							List<TAlarmRecord> eqAlarmList = alarmList.stream().filter(alarm -> equipment.getClientId().equals(alarm.getClientId())).collect(Collectors.toList());
+							equipmentDTO.setAlarmList(eqAlarmList);
 							return equipmentDTO;
 						}).collect(Collectors.toList());
 				dto.setEquipmentList(selList);
@@ -96,6 +98,9 @@ public class TEquipmentController extends BaseController<TEquipment,TEquipmentEx
 			criteria.andAdminIdEqualTo(param.getId());
 			List<TEquipment> equipmentList = tEquipmentService.selectByOption(example);
 			List<TAlarmRecord> alarmRecordList = tAlarmRecordService.getLastAlarmRecord(param.getId());
+			//获取当前用户今天所有机器的所以警报信息
+			List<TAlarmRecord> alarmList = tAlarmRecordService.getAlarmList(param.getId());
+
 			List<TEquipmentDTO> equipmentDTOList = equipmentList.stream().map(equipment -> {
 				TEquipmentDTO equipmentDTO = new TEquipmentDTO();
 				BeanUtils.copyPropertiesIgnoreNull(equipment,equipmentDTO,true);
@@ -103,13 +108,14 @@ public class TEquipmentController extends BaseController<TEquipment,TEquipmentEx
 				if(op.isPresent()){
 					equipmentDTO.setAlarmContent(op.get().getAlarmContent());
 					equipmentDTO.setOccurrenceTime(op.get().getOccurrenceTime());
-					//获取当前用户今天所有机器的所以警报信息
-					List<TAlarmRecord> alarmList = tAlarmRecordService.getAlarmList(equipment.getId());
-					equipmentDTO.setAlarmList(alarmList);
 				}
+				//获取该机器的所有警报信息
+				List<TAlarmRecord> eqAlarmList = alarmList.stream().filter(alarm -> equipment.getClientId().equals(alarm.getClientId())).collect(Collectors.toList());
+				equipmentDTO.setAlarmList(eqAlarmList);
 				return equipmentDTO;
 			}).collect(Collectors.toList());
 
+
 			dto.setEquipmentList(equipmentDTOList);
 			resultList.add(dto);
 		}

src/main/java/com/shawn/web/controller/TOrderController.java

@@ -55,6 +55,7 @@ public class TOrderController extends BaseController<TOrder,TOrderExample,TOrder
 						.setMessage("SUCCESS"));
 	}
 
+
 	@PostMapping("/getMainStatistics")
 	public ResponseEntity<?> getMainStatistics(@RequestBody StatisticsParam param) {
 		return ResponseEntity
@@ -65,6 +66,22 @@ public class TOrderController extends BaseController<TOrder,TOrderExample,TOrder
 						.setMessage("SUCCESS"));
 	}
 
+	/**
+	 *  统计 机器销售
+	 * @param param
+	 * @return
+	 */
+	@PostMapping("/getEquipmentStatistics")
+	public ResponseEntity<?> getEquipmentStatistics(@RequestBody StatisticsParam param) {
+		log.info("param:{}", param);
+		FgObjectUtil.objectNullOrEmptySel(param, "chartType$");
+		ChartColumn chartColumn  = tOrderService.getEquipmentStatistics(param);
 
-
+		return ResponseEntity
+				.status(HttpStatus.OK)
+				.body(new ResultMessage()
+						.setCode(true)
+						.setData(chartColumn)
+						.setMessage("SUCCESS"));
+	}
 }

src/main/resources/com/shawn/repository/mybatis/TAlarmRecordMapper.xml

@@ -480,8 +480,11 @@
     SELECT * FROM
 	t_alarm_record a
     where 1=1
-    <if test="equipmentId != null and equipmentId !=''">
-      and a.equipment_id = #{equipmentId}
+<!--    <if test="equipmentId != null and equipmentId !=''">-->
+<!--      and a.equipment_id = #{equipmentId}-->
+<!--    </if>-->
+    <if test="adminId != null and adminId !=''">
+      and a.admin_id = #{adminId}
     </if>
     AND date_format(a.create_date, '%Y-%m-%d') = date_format(now(), '%Y-%m-%d')
   </select>

src/main/resources/com/shawn/repository/mybatis/TOrderMapper.xml

@@ -783,4 +783,17 @@ where date_format(a.create_date,'%Y') = date_format(now(),'%Y')
       and a.equipment_id= #{equipmentId} -- 设备id
     </if>
   </select>
+
+  <!-- 统计 机器销售-->
+  <select id="getEquipmentStatistics" resultMap="chartBean" parameterType="com.shawn.model.param.StatisticsParam">
+   select ifnull(b.name,SUBSTRING(a.client_id,1,4)) as categorie,count(1) as saleNum,sum(a.price) as salePrice
+from t_order a,t_equipment b
+where b.id = a.equipment_id
+and a.admin_id= #{adminId} -- 所属商家id
+AND a.create_date >= STR_TO_DATE(CONCAT(#{startDate},' 00:00:00'),'%Y/%m/%d %H:%i:%s')
+      <![CDATA[ AND a.create_date <= STR_TO_DATE(CONCAT(#{endDate},' 23:59:59'),'%Y/%m/%d %H:%i:%s') ]]>
+group by b.id
+order by saleNum desc
+limit 10
+  </select>
 </mapper>