Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/BubbleTipAction.java

@@ -23,7 +23,7 @@ import com.yeejoin.amos.fas.business.service.model.ToipResponse;
 @Component
 public class BubbleTipAction implements CustomerAction
 {
-	private static String PACKAGEURL = "com.yeejoin.amos.rule.map.action.result.message.";
+	private static String PACKAGEURL = "com.yeejoin.amos.fas.business.action.result.message.";
 	
 	//@ExposeAction("气泡提示")
 	public void sendBubbleTip(Object bizobj, Boolean showInfo, Object title, String type)

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/RiskSituationAction.java

@@ -22,7 +22,7 @@ import com.yeejoin.amos.fas.business.service.model.ToipResponse;
 @Component
 public class RiskSituationAction implements CustomerAction
 {
-	private static String PACKAGEURL = "com.yeejoin.amos.rule.map.action.result.message.";
+	private static String PACKAGEURL = "com.yeejoin.amos.fas.business.action.result.message.";
 	
 	//@ExposeAction("气泡提示")
 	public void sendBubbleTip(Object bizobj, Boolean showInfo, String title)

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/SimpleTipAction.java

@@ -92,8 +92,7 @@ public class SimpleTipAction implements CustomerAction
 					}
 			}
 			MessageRo messageRo = (MessageRo)abstractActionResult.getToipResponse().getBizObj();
-			message.setTime(messageRo.getCreateDate());
-			//目前获取不到id
+			message.setTime(messageRo.getDateTime());
 			message.setBizId(messageRo.getId());
 			message.setBizclassName(abstractActionResult.getToipResponse().getBizObj().getClass().toString());
 			message.setType(type);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/AvoidLoginController.java

+package com.yeejoin.amos.fas.business.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
+import com.yeejoin.amos.fas.business.vo.Toke;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: xinglei
+ * @Description:
+ * @Date: 2020/5/27 15:26
+ */
+@RestController
+@RequestMapping("/api/login")
+@Api("免密登录api")
+public class AvoidLoginController extends BaseController{
+
+    @Value("${oauth2.accessToken}")
+    private String checkAccessToken;
+
+    @Value("${oauth2.password}")
+    private String password;
+
+    @Autowired
+    private RemoteSecurityService remoteSecurityService;
+
+    @ApiOperation(httpMethod = "GET",value = "免密登录获取token", notes = "免密登录获取token")
+    @RequestMapping(value = "/avoid/{loginId}/{accessToken}/{expireTime}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public CommonResponse avoidLogin(@PathVariable String loginId, @PathVariable String accessToken, @PathVariable Integer expireTime) {
+        if (accessToken.equals(checkAccessToken)){
+            Toke toke = remoteSecurityService.avoidLogin(loginId, password, expireTime);
+            return CommonResponseUtil.success(toke);
+        }
+        return CommonResponseUtil.failure("令牌不正确");
+    }
+}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/CommonController.java

@@ -174,4 +174,6 @@ public class CommonController extends BaseController {
         List<AgencyUserModel> users = commonService.getAllUser(getToken(),getProduct(),getAppKey(), compCode);
         return CommonResponseUtil.success(users);
     }
+
+
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/CurCompanyController.java

@@ -24,9 +24,6 @@ public class CurCompanyController extends BaseController {
 		map.put("company", getSelectedOrgInfo().getCompany());
 		map.put("department", getSelectedOrgInfo().getDepartment());
 
-		
 		return CommonResponseUtil.success(map);
 	}
-	
-	
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ExcelController.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.fas.business.param.FireEquipmentPointParam;
 import com.yeejoin.amos.fas.business.param.WaterResourceParam;
 import com.yeejoin.amos.fas.business.service.intfc.IExcelService;
 import com.yeejoin.amos.fas.business.util.FileHelper;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import io.swagger.annotations.Api;
@@ -57,7 +58,9 @@ public class ExcelController extends BaseController {
         if (fileName.endsWith(".xls") || fileName.endsWith(".xlsx")) {
             try {
                 List<FireEquipmentPointParam> list = FileHelper.importExcel(file, 1, 1, FireEquipmentPointParam.class);
-                iExcelService.importFireEquipmentPoint(list);
+                ReginParams reginParams =getSelectedOrgInfo();
+        		String orgCode=getOrgCode(reginParams);
+                iExcelService.importFireEquipmentPoint(list, orgCode,getUserId());
                 return CommonResponseUtil.success();
             } catch (Exception e) {
                 logger.info("导入装备监测点数据", e);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireEquimtPointController.java

 package com.yeejoin.amos.fas.business.controller;
 
 import com.google.common.collect.Maps;
+import com.yeejoin.amos.fas.business.dao.mapper.FireEquipPointMapper;
 import com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentPointEntity;
 import com.yeejoin.amos.fas.business.service.intfc.IFireEquipPontService;
 import com.yeejoin.amos.fas.business.vo.ReginParams;
@@ -38,7 +39,8 @@ public class FireEquimtPointController extends BaseController {
 
     @Autowired
     private IFireEquipPontService fireEquipPontService;
-
+    @Autowired
+    private FireEquipPointMapper fireEquipPointMapper;
 
     @ApiOperation(httpMethod = "POST", value = "添加风险点", notes = "添加风险点")
     @RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
@@ -55,6 +57,14 @@ public class FireEquimtPointController extends BaseController {
 		fireEquipmentPoint.setOrgCode(compCode);
         fireEquipmentPoint.setCreateBy(getUserId());
         fireEquipmentPoint.setCreateDate(new Date());
+        
+        
+        //根据编号查询监测点
+        FireEquipmentPointEntity pointEntity = fireEquipPointMapper.getByCode(fireEquipmentPoint.getCode());
+        if (pointEntity != null) {
+            return CommonResponseUtil.failure("监测点编号已经存在");
+        }
+        
         return CommonResponseUtil.success(fireEquipPontService.savePoint(fireEquipmentPoint));
     }
 
@@ -143,6 +153,10 @@ public class FireEquimtPointController extends BaseController {
         if (fireEquipmentPointEntity.getFireEquipmentId() == null) {
             fireEquipmentPointEntity.setFireEquipmentId(0L);
         }
+        
+       
+        
+        
         return fireEquipPontService.save(fireEquipmentPointEntity);
     }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/MessageMapper.java

+package com.yeejoin.amos.fas.business.dao.mapper;
+
+import java.util.List;
+
+import com.yeejoin.amos.fas.dao.entity.Message;
+
+public interface MessageMapper extends BaseMapper {
+	
+	void save(Message msg);
+	
+	List<Message> findMessageByBizId(String bizId);
+
+}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/RemoteSecurityService.java

@@ -164,11 +164,33 @@ public class RemoteSecurityService {
     }
 
 
-    
-    
-    
-    
-    
+	/**
+	 *  免密登录
+	 * @return
+	 */
+	public Toke avoidLogin(String loginId, String password, Integer expireTime){
+		StationAuthModel  stationAuthModel=new StationAuthModel();
+		stationAuthModel.setLoginId(loginId);
+		stationAuthModel.setPassword(password);
+		stationAuthModel.setExpireTime(expireTime);
+		Map map=null;
+		FeignClientResult feignClientResult;
+		Toke oked=new Toke();
+		try {
+			RequestContext.setProduct(productWeb);
+			feignClientResult = Privilege.authClient.idpasswordStation(stationAuthModel);
+			//Privilege.authClient.idpasswordStation();
+			map = (Map) feignClientResult.getResult();
+			if(map!=null){
+				oked.setToke(map.get("token").toString());
+				oked.setProduct(productWeb);
+				oked.setAppKey(appKeyWeb);
+			}
+		} catch (InnerInvokException e) {
+			e.printStackTrace();
+		}
+		return oked;
+	}
 
 /*    public List<UserModel> listUserByRoleIds(String roleIds) {
         CommonResponse commonResponse = iAmosSecurityServer.listUserByRoleIds(roleIds);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/param/FireEquipmentPointParam.java

 package com.yeejoin.amos.fas.business.param;
 
+import java.util.Date;
+
 import cn.afterturn.easypoi.excel.annotation.Excel;
 
 public class FireEquipmentPointParam {
@@ -32,6 +34,51 @@ public class FireEquipmentPointParam {
     @Excel(name = "告警类型", replace = {"火灾告警_1", "电源开关_2", "换流变_6", "液位_3", "流量_4", "容量_5", "故障告警_7"}, orderNum = "8")
     private Long alarmType;
 
+    
+    //增加所属公司orgcode
+    
+    private String orgCode;
+    
+    private String createBy ;
+    private Date createDate =new Date();
+    private String remark ;   
+ 
+ 
+ 
+
+    
+    public String getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
 	public Long getId() {
         return id;
     }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ExcelServiceImpl.java

@@ -71,7 +71,7 @@ public class ExcelServiceImpl implements IExcelService {
 
     @Transactional
     @Override
-    public void importFireEquipmentPoint(List<FireEquipmentPointParam> list) {
+    public void importFireEquipmentPoint(List<FireEquipmentPointParam> list,String orgCode,String userid) {
         Set<String> equipmentCodeSet = Sets.newHashSet(Lists.transform(list, FireEquipmentPointParam::getFireEquipmentCode));
         List<FireEquipmentEntity> equipments = fireEquipMapper.listByCodes(equipmentCodeSet);
         Map<String, FireEquipmentEntity> equipmentMap = Maps.uniqueIndex(equipments, FireEquipmentEntity::getCode);
@@ -90,6 +90,11 @@ public class ExcelServiceImpl implements IExcelService {
             } else {
                 point.setFireEquipmentId(0L);
             }
+            
+            //设置orgcode
+            point.setOrgCode(orgCode);
+            point.setCreateBy(userid);
+            
             if (pointEntity == null) {
                 saveList.add(point);
             } else {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/MessageServiceImpl.java

@@ -2,8 +2,10 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.yeejoin.amos.fas.business.dao.mapper.MessageMapper;
 import com.yeejoin.amos.fas.business.service.intfc.IMessageService;
 import com.yeejoin.amos.fas.dao.entity.Message;
 
@@ -11,18 +13,17 @@ import com.yeejoin.amos.fas.dao.entity.Message;
 
 @Service
 public class MessageServiceImpl  implements IMessageService  {
-	//MessageMapper messageMapper;
+	
+	@Autowired
+	MessageMapper messageMapper;
 		
 	@Override
 	public List<Message> findMessageByBizId(String bizId) {
-		return null;
-		// TODO Auto-generated method stub
-		// messageRepository.findMessageByBizId(bizId);
+		return messageMapper.findMessageByBizId(bizId);
 	}
 
 	@Override
 	public void save(Message msg) {
-		// TODO Auto-generated method stub
-		
+		messageMapper.save(msg);
 	}
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -56,6 +56,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.component.cache.Redis;
 import org.typroject.tyboot.component.cache.enumeration.CacheType;
 
@@ -540,17 +541,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
         content = fmeaPointInputitemMapper.listByFmeaId(fmeaId, pageNumber, pageSize);
         if(!CollectionUtils.isEmpty(content)){
-            Set<String> userIds = new HashSet<>();
-            Set<String> deptIds = new HashSet<>();
-            for(Map<String, Object> map : content)
-            {
-                String userId = String.valueOf(map.get("userId"));
-                String deptId = String.valueOf(map.get("deptId"));
-                userIds.add(userId);
-                deptIds.add(deptId);
-            }
-            userIds.remove(null);
-            deptIds.remove(null);
+            Set<Object> userIds = content.stream().filter(x -> !StringUtils.isEmpty(x.get("userId"))).map(arg0 -> arg0.get("userId")).collect(Collectors.toSet());
+            Set<Object> deptIds = content.stream().filter(x -> !StringUtils.isEmpty(x.get("deptId"))).map(arg0 -> arg0.get("deptId")).collect(Collectors.toSet());
             List<AgencyUserModel> users = new ArrayList<>();
             if(!CollectionUtils.isEmpty(userIds)){
                 users = remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIds));

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IExcelService.java

@@ -11,7 +11,7 @@ public interface IExcelService {
 
     void importFireEquipment(List<FireEquipmentParam> list);
 
-    void importFireEquipmentPoint(List<FireEquipmentPointParam> list);
+    void importFireEquipmentPoint(List<FireEquipmentPointParam> list,String orgcode,String uid);
 
     List<?>  exportPointData(Map<String, Object> paramsMap);
 

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -3,6 +3,9 @@ security.loginId=tw3
 security.productWeb=CONVERTER_STATION_WEB
 security.appKeyWeb=CONVERTER_STATION
 
+oauth2.accessToken=my
+oauth2.password=a123456
+ 
 #environment
 #spring.profiles.active = dev
 eureka.client.serviceUrl.defaultZone=http://172.16.3.75:10001/eureka/

YeeAmosFireAutoSysStart/src/main/resources/application-docker.properties

@@ -3,6 +3,9 @@ security.loginId=tw3
 security.productWeb=CONVERTER_STATION_WEB
 security.appKeyWeb=CONVERTER_STATION
 
+oauth2.accessToken=my
+oauth2.password=a123456
+ 
 #environment
 #spring.profiles.active = dev
 eureka.client.serviceUrl.defaultZone=http://amos-eurka:10001/eureka/

YeeAmosFireAutoSysStart/src/main/resources/application-test.properties

@@ -3,6 +3,9 @@ security.loginId=tw3
 security.productWeb=CONVERTER_STATION_WEB
 security.appKeyWeb=CONVERTER_STATION
 
+oauth2.accessToken=my
+oauth2.password=a123456
+ 
 #environment
 #spring.profiles.active = dev
 eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equippoint.xml

@@ -103,7 +103,9 @@
 			fire_equipment_id,
 			type,
 			unit,
-			alarm_type
+			alarm_type,
+			org_code,
+			create_by
 		)
 		values
 		<foreach collection="list" item="item" index="index" separator=",">
@@ -113,7 +115,9 @@
 			#{item.fireEquipmentId},
 			#{item.type},
 			#{item.unit},
-			#{item.alarmType}
+			#{item.alarmType},
+			#{item.orgCode},
+			#{item.createBy}
 		)
 		</foreach>
 	</insert>

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_message.xml

+<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.fas.business.dao.mapper.MessageMapper">
+	<select id="findMessageByBizId" resultType="com.yeejoin.amos.fas.dao.entity.Message" >
+		SELECT
+		id,
+		time,
+		title,
+		content,
+		type,
+		sender,
+		receiver,
+		reader,
+		biz_id AS bizId,
+		bizclass_name AS bizclassName, 
+		create_date AS createDate,
+		create_user AS createUser,
+		update_date AS updateDate,
+		update_user AS updateUser,
+		is_delete AS isDelete
+		FROM toip_sys_message WHERE biz_id=#{bizId}
+		
+	</select>
+	
+	<insert id="save" >
+		INSERT INTO toip_sys_message (id,time,title,content,type,sender,receiver,reader,biz_id,bizclass_name) 
+		VALUES(#{id},#{time},#{title},#{content},#{type},#{sender},#{receiver},#{reader},#{bizId},#{bizclassName})	
+	</insert>
+</mapper>
\ No newline at end of file