ソースを参照

update:

master
lgh 1年前
コミット
0616844403
3個のファイルの変更25行の追加19行の削除
  1. +2
    -1
      6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ScreenController.java
  2. +1
    -1
      6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CountEleVo.java
  3. +22
    -17
      6.program/wms-empty/src/main/resources/mapper/EleMapper.xml

+ 2
- 1
6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ScreenController.java ファイルの表示

@@ -90,7 +90,8 @@ public class ScreenController extends BaseController {
}
return successful(kilnInfoList);
}

@PostMapping(value = "getEleList")
@ApiOperation(value = "获取加工炉最近十条加工任务电能消耗信息")
public R countEleByKiln(@Validated @RequestBody IdParam idParam) {
return eleService.list(idParam.getId());
}


+ 1
- 1
6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CountEleVo.java ファイルの表示

@@ -28,7 +28,7 @@ public class CountEleVo {
* 消耗值
*/
@ApiModelProperty(value = "消耗值", example = "0.0")
private Float value;
private Float totalBat;

/**
* 名称


+ 22
- 17
6.program/wms-empty/src/main/resources/mapper/EleMapper.xml ファイルの表示

@@ -11,28 +11,33 @@
<resultMap id="BaseResultMap" type="com.mt.wms.empty.vo.CountEleVo">
<id column="task_id" property="taskId"/>
<result column="create_time" property="createTime"/>
<result column="total_bat" property="value"/>
<result column="total_bat" property="totalBat"/>
</resultMap>

<!-- 根据角色查询菜单,角色已分配的菜单标记为选中状态 -->
<select id="list"
resultType="com.mt.wms.empty.vo.CountEleVo">
SELECT menu.id AS id,
menu.parent_id AS parentId,
menu.code AS code,
menu.name AS name,
menu.category AS category,
menu.type AS type,
menu.order_num AS orderNum,
roleMenu.id AS checked
FROM t_sys_menu AS menu
LEFT JOIN t_sys_role_menu AS roleMenu ON menu.id = roleMenu.menu_id
AND roleMenu.role_id = #{roleId}
AND roleMenu.valid = 1
WHERE menu.valid = 1
AND menu.enabled = 1
AND menu.category = #{category}
ORDER BY menu.order_num
select
tpev .task_id ,
tpev.total_bat,
tpev .create_time ,
tpev .kiln_id
from
t_par_ele_value tpev
inner join(
select
max(total_bat) as total_bat ,
task_id
from
t_par_ele_value tpev2
group by
task_id
)tpev3 on
tpev .task_id = tpev3.task_id
and tpev .total_bat = tpev3.total_bat
where tpev .kiln_id =#{kilnId}
order by tpev .create_time desc
limit 10
</select>



読み込み中…
キャンセル
保存