LY

master/src/main/java/com/ruoyi/project/aspen/controller/TDashboarddataController.java

@@ -38,7 +38,6 @@ public class TDashboarddataController extends BaseController
     /**
      * 查询dashboard抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:list')")
     @GetMapping("/list")
     public List<TDashboarddata> list(TDashboarddata tDashboarddata)
     {
@@ -49,7 +48,6 @@ public class TDashboarddataController extends BaseController
     /**
      * 查询最后一条dashboard抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:query')")
     @GetMapping("/selectLast")
     public AjaxResult selectLast(TDashboarddata tDashboarddata)
     {
@@ -60,7 +58,6 @@ public class TDashboarddataController extends BaseController
     /**
      * 导出dashboard抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:export')")
     @Log(title = "dashboard抓取数据", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TDashboarddata tDashboarddata)
@@ -73,7 +70,6 @@ public class TDashboarddataController extends BaseController
     /**
      * 获取dashboard抓取数据详细信息
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -83,7 +79,6 @@ public class TDashboarddataController extends BaseController
     /**
      * 新增dashboard抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:add')")
     @Log(title = "dashboard抓取数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TDashboarddata tDashboarddata)
@@ -94,7 +89,6 @@ public class TDashboarddataController extends BaseController
     /**
      * 修改dashboard抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:edit')")
     @Log(title = "dashboard抓取数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TDashboarddata tDashboarddata)
@@ -105,7 +99,6 @@ public class TDashboarddataController extends BaseController
     /**
      * 删除dashboard抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:remove')")
     @Log(title = "dashboard抓取数据", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/aspen/controller/TDashboarddayController.java

@@ -36,7 +36,6 @@ public class TDashboarddayController extends BaseController
     /**
      * 查询DASHBOARD每日抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:list')")
     @GetMapping("/list")
     public TableDataInfo list(TDashboardday tDashboardday)
     {
@@ -48,7 +47,6 @@ public class TDashboarddayController extends BaseController
     /**
      * 查询最近31条DASHBOARD每日抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:list')")
     @GetMapping("/month")
     public AjaxResult selectLast(TDashboardday tDashboardday)
     {
@@ -59,7 +57,6 @@ public class TDashboarddayController extends BaseController
     /**
      * 导出DASHBOARD每日抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:export')")
     @Log(title = "DASHBOARD每日抓取数据", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TDashboardday tDashboardday)
@@ -72,7 +69,6 @@ public class TDashboarddayController extends BaseController
     /**
      * 获取DASHBOARD每日抓取数据详细信息
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -82,7 +78,6 @@ public class TDashboarddayController extends BaseController
     /**
      * 新增DASHBOARD每日抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:add')")
     @Log(title = "DASHBOARD每日抓取数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TDashboardday tDashboardday)
@@ -93,7 +88,6 @@ public class TDashboarddayController extends BaseController
     /**
      * 修改DASHBOARD每日抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:edit')")
     @Log(title = "DASHBOARD每日抓取数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TDashboardday tDashboardday)
@@ -104,7 +98,6 @@ public class TDashboarddayController extends BaseController
     /**
      * 删除DASHBOARD每日抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:remove')")
     @Log(title = "DASHBOARD每日抓取数据", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/aspen/controller/TDashboarddayelecController.java

@@ -38,7 +38,6 @@ public class TDashboarddayelecController extends BaseController
     /**
      * 查询电厂大屏每日0：00抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:list')")
     @GetMapping("/list")
     public TableDataInfo list(TDashboarddayelec tDashboarddayelec)
     {
@@ -50,7 +49,6 @@ public class TDashboarddayelecController extends BaseController
     /**
      * 导出电厂大屏每日0：00抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:export')")
     @Log(title = "电厂大屏每日0：00抓取数据", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TDashboarddayelec tDashboarddayelec)
@@ -63,7 +61,6 @@ public class TDashboarddayelecController extends BaseController
     /**
      * 获取电厂大屏每日0：00抓取数据详细信息
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +70,6 @@ public class TDashboarddayelecController extends BaseController
     /**
      * 新增电厂大屏每日0：00抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:add')")
     @Log(title = "电厂大屏每日0：00抓取数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TDashboarddayelec tDashboarddayelec)
@@ -84,7 +80,6 @@ public class TDashboarddayelecController extends BaseController
     /**
      * 修改电厂大屏每日0：00抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:edit')")
     @Log(title = "电厂大屏每日0：00抓取数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TDashboarddayelec tDashboarddayelec)
@@ -95,7 +90,6 @@ public class TDashboarddayelecController extends BaseController
     /**
      * 删除电厂大屏每日0：00抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayelec:remove')")
     @Log(title = "电厂大屏每日0：00抓取数据", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -106,7 +100,6 @@ public class TDashboarddayelecController extends BaseController
     /**
      * 查询最后一条dashboard抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardelecdata:query')")
     @GetMapping("/selectLast")
     public AjaxResult selectLast(TDashboarddayelec tDashboarddayelec)
     {
@@ -117,7 +110,6 @@ public class TDashboarddayelecController extends BaseController
     /**
      * 查询最近31条DASHBOARD每日抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:list')")
     @GetMapping("/month")
     public AjaxResult selectMonth(TDashboarddayelec tDashboarddayelec)
     {
@@ -128,7 +120,6 @@ public class TDashboarddayelecController extends BaseController
     /**
      * 查询最近一周DASHBOARD每日抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:list')")
     @GetMapping("/week")
     public AjaxResult selectWeek(TDashboarddayelec tDashboarddayelec)
     {
@@ -139,7 +130,6 @@ public class TDashboarddayelecController extends BaseController
     /**
      * 查询最近49天DASHBOARD每日抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboardday:list')")
     @GetMapping("/fiftyday")
     public AjaxResult selecctfiftyday(TDashboarddayelec tDashboarddayelec)
     {

master/src/main/java/com/ruoyi/project/aspen/controller/TDashboarddayeleceightController.java

@@ -38,7 +38,6 @@ public class TDashboarddayeleceightController extends BaseController
     /**
      * 查询电厂大屏每日8：00抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:list')")
     @GetMapping("/list")
     public TableDataInfo list(TDashboarddayeleceight tDashboarddayeleceight)
     {
@@ -50,7 +49,6 @@ public class TDashboarddayeleceightController extends BaseController
     /**
      * 导出电厂大屏每日8：00抓取数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:export')")
     @Log(title = "电厂大屏每日8：00抓取数据", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TDashboarddayeleceight tDashboarddayeleceight)
@@ -63,7 +61,6 @@ public class TDashboarddayeleceightController extends BaseController
     /**
      * 获取电厂大屏每日8：00抓取数据详细信息
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +70,6 @@ public class TDashboarddayeleceightController extends BaseController
     /**
      * 新增电厂大屏每日8：00抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:add')")
     @Log(title = "电厂大屏每日8：00抓取数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TDashboarddayeleceight tDashboarddayeleceight)
@@ -84,7 +80,6 @@ public class TDashboarddayeleceightController extends BaseController
     /**
      * 修改电厂大屏每日8：00抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:edit')")
     @Log(title = "电厂大屏每日8：00抓取数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TDashboarddayeleceight tDashboarddayeleceight)
@@ -95,7 +90,6 @@ public class TDashboarddayeleceightController extends BaseController
     /**
      * 删除电厂大屏每日8：00抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:remove')")
     @Log(title = "电厂大屏每日8：00抓取数据", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -106,7 +100,6 @@ public class TDashboarddayeleceightController extends BaseController
     /**
      * 查询电厂大屏每日8：00抓取数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:dashboarddayeleceight:list')")
     @GetMapping("/week")
     public AjaxResult selectWeek(TDashboarddayeleceight tDashboarddayeleceight)
     {

master/src/main/java/com/ruoyi/project/sems/controller/SpecHomeController.java

@@ -162,8 +162,7 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                  .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
-                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
                 );
         Map<String, Object> mapgl = new HashMap<String, Object>();
         mapgl.put("glAll_num", glAll);
@@ -172,8 +171,6 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
-                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
         );
         Map<String, Object> mapdt = new HashMap<String, Object>();
         mapdt.put("dtAll_num", dtAll);
@@ -182,17 +179,13 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .like("CHECK_STRATEGY","强制")
-                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
         );
         int dzsbUn = tSpecdevDzsbService.count(new QueryWrapper<TSpecdevDzsb>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .notLike("CHECK_STRATEGY","强制")
-                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
         );
 
         Map<String, Object> mapdzsb = new HashMap<String, Object>();
@@ -203,8 +196,6 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
-                .and(unitIds.size()>0 ,i -> i.in("plant_code",unitIds))
         );
         Map<String, Object> mapcc = new HashMap<String, Object>();
         mapcc.put("ccAll_num", ccAll);

master/src/main/java/com/ruoyi/project/training/mapper/TTrainingParticipantsMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.training.domain.TTrainingParticipants;
 
 /**
  * 人员-公司级培训关系Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-05-30
  */
-public interface TTrainingParticipantsMapper 
+public interface TTrainingParticipantsMapper
 {
     /**
      * 查询人员-公司级培训关系
-     * 
+     *
      * @param id 人员-公司级培训关系ID
      * @return 人员-公司级培训关系
      */
@@ -22,7 +22,7 @@ public interface TTrainingParticipantsMapper
 
     /**
      * 查询人员-公司级培训关系列表
-     * 
+     *
      * @param tTrainingParticipants 人员-公司级培训关系
      * @return 人员-公司级培训关系集合
      */
@@ -33,7 +33,7 @@ public interface TTrainingParticipantsMapper
 
     /**
      * 新增人员-公司级培训关系
-     * 
+     *
      * @param tTrainingParticipants 人员-公司级培训关系
      * @return 结果
      */
@@ -41,7 +41,7 @@ public interface TTrainingParticipantsMapper
 
     /**
      * 修改人员-公司级培训关系
-     * 
+     *
      * @param tTrainingParticipants 人员-公司级培训关系
      * @return 结果
      */
@@ -50,7 +50,7 @@ public interface TTrainingParticipantsMapper
     public int updateTTrainingParticipantsByStaffAndCom(TTrainingParticipants tTrainingParticipants);
     /**
      * 删除人员-公司级培训关系
-     * 
+     *
      * @param id 人员-公司级培训关系ID
      * @return 结果
      */
@@ -58,7 +58,7 @@ public interface TTrainingParticipantsMapper
 
     /**
      * 批量删除人员-公司级培训关系
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

ui/src/views/monitor/elec/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="front" style="width: 100%; height: 100%">
+  <div id="front" style="width: 100%; height: 100%; font-size: 12px">
     <dv-loading v-if="loading">Loading...</dv-loading>
     <div v-else class="host-body bg">
       <div class="d-flex jc-center">