菜单修改增加英文名称和动态图标

sms_water/src/main/java/com/huaxu/controller/ComDisplayController.java

@@ -118,15 +118,15 @@ public class ComDisplayController {
                 }
             }
         }
-
+        //对数据进行单位转换 按万进行统计
+        sceneUsageDto.setYieldWaterUsage(sceneUsageDto.getYieldWaterUsage()!=null? (double) Math.round(sceneUsageDto.getYieldWaterUsage()/(float)100)/100:0);
+        sceneUsageDto.setPowerUsage(sceneUsageDto.getPowerUsage()!=null? (double) Math.round(sceneUsageDto.getPowerUsage()/(float)100)/100:0);
         if (sceneUsageDto.getPowerUsage() != null && sceneUsageDto.getYieldWaterUsage() != null && sceneUsageDto.getPowerUsage() != 0) {
             sceneUsageDto.setYieldPowerUsage((double) Math.round((sceneUsageDto.getPowerUsage() / sceneUsageDto.getYieldWaterUsage()) * 100) / 100);
         } else {
             sceneUsageDto.setYieldPowerUsage(0d);
         }
-        //对数据进行单位转换 按万进行统计
-        sceneUsageDto.setYieldWaterUsage(sceneUsageDto.getYieldWaterUsage()!=null? (double) Math.round(sceneUsageDto.getYieldWaterUsage()/(float)100)/100:0);
-        return new AjaxMessage<>(ResultStatus.OK, sceneUsageDto);
+       return new AjaxMessage<>(ResultStatus.OK, sceneUsageDto);
     }
     @RequestMapping(value="selectMapForWholeCompany" , method = RequestMethod.GET)
     @ApiOperation(value = "二供供水排行--总公司")
@@ -176,7 +176,10 @@ public class ComDisplayController {
             receFee.get(0).setIntakeWaterUsage(monitorDataReportService.getAmountCount(companyOrgId, null, "水源", 4, 2).divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP).doubleValue());
             receFee.get(0).setYieldWaterUsage(monitorDataReportService.getAmountCount(companyOrgId, null, "水厂", 3, 2).divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP).doubleValue());
             double amount = receFee.get(0).getYieldWaterUsage() - waterUsage;
-            receFee.get(0).setWaterFeeRecoveryRate(BigDecimal.valueOf(amount).divide(BigDecimal.valueOf(receFee.get(0).getYieldWaterUsage()),3,BigDecimal.ROUND_HALF_UP).doubleValue());
+            if (receFee.get(0).getYieldWaterUsage() == 0d)
+                receFee.get(0).setWaterFeeRecoveryRate(0d);
+            else
+                receFee.get(0).setWaterFeeRecoveryRate(BigDecimal.valueOf(amount).divide(BigDecimal.valueOf(receFee.get(0).getYieldWaterUsage()), 3, BigDecimal.ROUND_HALF_UP).doubleValue());
         }
         return new AjaxMessage<>(ResultStatus.OK, receFee.get(0));
     }

sms_water/src/main/java/com/huaxu/service/impl/MonitorDataReportServiceImpl.java

@@ -1039,7 +1039,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
         WaterSupplyChart waterSupplyChart = new WaterSupplyChart();
         waterSupplyChart.setSort(1);
         waterSupplyChart.setDate(LocalDate.now().getYear()+"-"+LocalDate.now().getMonthValue());
-        waterSupplyChart.setPowerData(powerDataAmountCountMonth);
+        waterSupplyChart.setPowerData(powerDataAmountCountMonth.divide(BigDecimal.valueOf(10000),3, RoundingMode.HALF_UP));
         waterSupplyChart.setWaterData(waterDataAmountCountMonth.divide(BigDecimal.valueOf(10000),3, RoundingMode.HALF_UP));
         waterSupplyCharts.add(waterSupplyChart);
 

user_center/src/main/java/com/huaxu/entity/MenuEntity.java

@@ -112,6 +112,11 @@ public class MenuEntity {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    /** 显示状态 */
+    @ApiModelProperty(value = "是否权限菜单(0,没有此菜单权限，1拥有此菜单)")
+    @TableField(exist = false)
+    private Integer isOwner;
+
     /**
      * 租户标识
      */

user_center/src/main/java/com/huaxu/service/MenuService.java

@@ -17,6 +17,7 @@ import javax.annotation.Resource;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.google.common.collect.Lists.newArrayList;
 
@@ -277,28 +278,30 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 		Integer userId = currentUser.getId();
 		//-999租户管理员  -9999超级管理员  2普通用户
 		String userType = currentUser.getType();
-		List<MenuEntity> menuEntities= new ArrayList<>();
+		List<MenuEntity> menuEntities = new ArrayList<>();
 		switch (userType) {
-//			case "1"://超级管理员查询所有系统菜单
-//				menuEntities = menuMapper.findAllFirstMenu();
-//				break;
-//			case "2"://普通用户按角色查询租户菜单
-//				menuEntities = menuMapper.findUserFirstMenu(currentUser.getTenantId(),userId);
-//				break;
 			case "-9999"://超级管理员查询所有系统菜单
 				menuEntities = menuMapper.findAllFirstMenu();
 				break;
 			case "-999"://租户管理员查询租户菜单
 				menuEntities = menuMapper.findTenantFirstMenu(currentUser.getTenantId());
 				break;
-			default:	//其他租户用户暂时不区分类型
-				menuEntities = menuMapper.findUserFirstMenu(currentUser.getTenantId(),userId);
+			default:    //其他租户用户暂时不区分类型
+				menuEntities = menuMapper.findUserFirstMenu(currentUser.getTenantId(), userId);
 				break;
 		}
-
+		List<MenuEntity> menuAllEntities = menuMapper.findAllFirstMenu();
+		Map<Long, MenuEntity> map = menuAllEntities.stream().collect(Collectors.toMap(MenuEntity::getId, item -> item));
+		for (MenuEntity item : menuEntities) {
+			item.setIsOwner(1);
+			map.remove(item.getId());
+		}
+		for (MenuEntity item : map.values()) {
+			item.setIsOwner(0);
+			menuEntities.add(item);
+		}
 		return menuEntities;
 	}
-
 	public List<MenuEntity> findUserMenu(String appId) {
 		LoginUser currentUser = UserUtil.getCurrentUser();
 		Integer userId = currentUser.getId();

user_center/src/main/resources/mapper/MenuMapper.xml

@@ -214,12 +214,32 @@
     <!--  超级管理员查询 一级菜单List   -->
     <select id="findAllFirstMenu" resultType="com.huaxu.entity.MenuEntity">
         SELECT
-        <include refid="menuColumns"/>
+        a.id as "id" ,
+        a.app_id as "appId" ,
+        a.third_menu_id as "thirdMenuId" ,
+        a.parent_menu_id as "parentMenuId" ,
+        a.name as "name" ,
+        a.ENGLISHNAME as "englishName",
+        a.MENU_DYNAMICIMAGE as "menuDynamicImage",
+        a.menu_image as "menuImage" ,
+        a.permission_flag as "permissionFlag" ,
+        a.link_path as "linkPath" ,
+        a.seq as "seq" ,
+        case when a.is_admin=1 then 1 else 0 end as "isOwner",
+        a.show_state as "showState" ,
+        a.remark as "remark" ,
+        a.is_tenant as "isTenant" ,
+        a.is_admin as "isAdmin" ,
+        a.date_create as "dateCreate" ,
+        a.create_by as "createBy" ,
+        a.date_update as "dateUpdate" ,
+        a.update_by as "updateBy" ,
+        a.status as "status"
         FROM uims_menu a
         <where>
             a.status=1 and a.PARENT_MENU_ID=0 and a.SHOW_STATE=1 and  a.is_admin=1 and a.app_id != 1004
         </where>
-        order by a.seq
+        order by a.IS_ADMIN desc,a.seq
     </select>
     <!--  租户管理员查询租户菜单  -->
     <select id="findTenantByMenuId" resultType="com.huaxu.entity.MenuEntity">