修改配套设备查看

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

@@ -16,6 +16,7 @@ import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -177,11 +178,12 @@ public class FireSourceController extends BaseController {
             @ApiParam(value = "设备名称", required = false) @RequestParam(required = false) String name,
             @ApiParam(value = "设备编号", required = false) @RequestParam(required = false) String code,
             @ApiParam(value = "设备类型", required = false) @RequestParam(required = false) String equipClassify,
+            @ApiParam(value = "是否绑定配套设备", required = false) @RequestParam(required = false) String bindStation,
             int pageNumber, int pageSize) {
 
         CommonPageable commonPageable = new CommonPageable(pageNumber, pageSize);
         return CommonResponseUtil.success(iFireEquipService.queryForEquipmentList(StringUtils.trimToNull(name),
-                StringUtils.trimToNull(code), StringUtils.trimToNull(equipClassify), commonPageable));
+                StringUtils.trimToNull(code), StringUtils.trimToNull(equipClassify), commonPageable,StringUtils.trimToNull(bindStation)));
     }
 
     @ApiOperation(httpMethod = "GET", value = "消防状态明细信息", notes = "消防状态明细信息")

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

@@ -41,14 +41,16 @@ public interface FireEquipMapper extends BaseMapper {
 
     long queryForEquipmentPageCount(@Param("name") String name,
                                     @Param("code") String code,
-                                    @Param("equipClassify") String equipClassify);
+                                    @Param("equipClassify") String equipClassify,
+                                    @Param("bindStation") String bindStation);
 
     List<Map> queryForEquipmentPage(
             @Param("name") String name,
             @Param("code") String code,
             @Param("equipClassify") String equipClassify,
             @Param("start") long start,
-            @Param("length") int length);
+            @Param("length") int length,
+            @Param("bindStation") String bindStation);
 
 
     List<Map> queryForGroupCount(@Param("fireStationId") Long fireStationId);

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

@@ -119,9 +119,9 @@ public class FireEquipServiceImpl implements IFireEquipService {
     }
 
 
-   public  Page queryForEquipmentList(String name, String code,String equipClassify,CommonPageable commonPageable) {
-       long total = fireEquipMapper.queryForEquipmentPageCount( name, code,equipClassify);
-       List<Map> content  =  this.fireEquipMapper.queryForEquipmentPage(name, code,equipClassify,commonPageable.getOffset(),commonPageable.getPageSize());
+   public  Page queryForEquipmentList(String name, String code,String equipClassify,CommonPageable commonPageable,String bindStation) {
+       long total = fireEquipMapper.queryForEquipmentPageCount( name, code,equipClassify,bindStation);
+       List<Map> content  =  this.fireEquipMapper.queryForEquipmentPage(name, code,equipClassify,commonPageable.getOffset(),commonPageable.getPageSize(),bindStation);
        Page result = new CommonPage(content,  commonPageable, total);
        return result;
     }

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

@@ -35,7 +35,7 @@ public interface IFireEquipService {
 												  String endTime,
 												  CommonPageable commonPageable);
 
-	Page queryForEquipmentList(String name, String code,String equipClassify,CommonPageable commonPageable);
+	Page queryForEquipmentList(String name, String code,String equipClassify,CommonPageable commonPageable,String bindStation);
 
 	//查询设备明细
 	Object queryForDetail(String type, Long id) throws Exception;

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

@@ -15,7 +15,7 @@ eureka.client.healthcheck.enabled = true
 eureka.client.fetchRegistry = true
 eureka.instance.prefer-ip-address=true
 #DB properties:
-spring.datasource.url=jdbc:mysql://172.16.11.33:3306/safety-business-2.0?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.11.33:3306/safety-business-2.0-36?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=admin_1234
 spring.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -33,7 +33,7 @@ spring.data.mongodb.uri = mongodb://172.16.11.33:27017/iecmonitor
 params.remoteRuleUrl=http://magintursh.xicp.net:18080/
 params.remoteWebsocketUrl=http://172.16.10.91:10600/
 
-spring.redis.database=1
+spring.redis.database=5
 spring.redis.host=172.16.11.33
 spring.redis.port=6379
 spring.redis.password=1234560
@@ -44,7 +44,7 @@ spring.redis.jedis.pool.min-idle=0
 spring.redis.timeout=1000
 
 #picture upload
-file.uploadUrl=E:\\upload\\files\\
+file.uploadUrl=F:\\upload\\files\\
 #picture read
 file.readUrl=http://172.16.3.89:8083/file/getFile?in=
 params.isPush=true
@@ -57,6 +57,7 @@ emqx.user-name=super
 emqx.password=a123456
 
 Push.fegin.name=APPMESSAGEPUSHSERVICE-36
+
 dutyMode.fegin.name=AMOSDUTYMODE
 DutyMode.dutyUrl=http://172.16.11.36:10005/
 
@@ -64,4 +65,4 @@ DutyMode.dutyUrl=http://172.16.11.36:10005/
 rule.definition.load=true
 rule.definition.model-package=com.yeejoin.amos.fas.business.service.model
 
-amos.feign.gennerator.use-gateway=true
+amos.feign.gennerator.use-gateway=true
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/application.properties

-spring.application.name = AMOS-AUTOSYS-my
- 
+
+spring.application.name = Amos-autosys-sqy
+
 server.port = 8083
 
 spring.profiles.active=dev
@@ -33,21 +34,21 @@ mybatis.type-aliases-package = com.yeejoin.amos.fas.business.entity.mybatis
 mybatis.configuration.mapUnderscoreToCamelCase=true
 logging.level.com.yeejoin.amos.fas.business.dao.mapper=debug
 
-spring.servlet.multipart.max-file-size=20MB
-spring.servlet.multipart.max-request-size=20MB
-
 #liquibase
 spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
 spring.liquibase.enabled= true
-param.system.online.date = 2020-02-12
+param.system.online.date = 2019-02-12
+
+spring.servlet.multipart.max-file-size=20MB
+spring.servlet.multipart.max-request-size=20MB
 
+#feginName
 visual.fegin.name=maas-visual
+dutyMode.fegin.name=AMOSDUTYMODE
+
 spring.http.multipart.maxFileSize = 10480000
 spring.http.multipart.MaxRequestSize = 50480000
-windows.img.path = E:\\
+windows.img.path = F:\\
 linux.img.path = /
 
-
 param.safetyIndexChange.cron = 0 0 2 * * ?
-
-