Skip to content

A
amos-boot-biz
Commit 09404f3d authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.集成机场单位等通用功能

parent 1b48627c
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 458 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java
View file @ 09404f3d
......@@ -19,7 +19,7 @@ import java.util.Map;
*
* @author Dell
*/
@FeignClient(name = "${equip.fegin.name}", path = "equip", configuration = {MultipartSupportConfig.class})
@FeignClient(name = "${equip.fegin.name:AMOS-EQUIPMENT}", path = "equip", configuration = {MultipartSupportConfig.class})
public interface EquipFeignClient {
/**
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/IotFeignClient.java
View file @ 09404f3d
......@@ -17,7 +17,7 @@ import java.util.Map;
*
* @author Dell
*/
@FeignClient(name ="${iot.fegin.name}", path = "iot", configuration = {MultipartSupportConfig.class})
@FeignClient(name ="${iot.fegin.name:AMOS-API-IOT}", path = "iot", configuration = {MultipartSupportConfig.class})
public interface IotFeignClient {
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/JcsControlServerClient.java
View file @ 09404f3d
......@@ -15,7 +15,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
* @author gwb
* @version $Id: JcsControlServerClient.java, v 0.1 2021年8月19日 上午9:41:10 gwb Exp $
*/
@FeignClient(name = "${control.fegin.name}", configuration = {MultipartSupportConfig.class})
@FeignClient(name = "${control.fegin.name:JCS-API-CONTROL}", configuration = {MultipartSupportConfig.class})
public interface JcsControlServerClient {
/**
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/KnowledgebaseFeignClient.java
View file @ 09404f3d
......@@ -9,7 +9,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
@FeignClient(name = "${Knowledgebase.fegin.name}",path = "knowledgebase" ,configuration = {MultipartSupportConfig.class})
@FeignClient(name = "${Knowledgebase.fegin.name:AMOS-API-KNOWLEDGEBASE}",path = "knowledgebase" ,configuration = {MultipartSupportConfig.class})
public interface KnowledgebaseFeignClient {
@RequestMapping(value = "/v1/tagvalue/getAll/tegartValue", method = RequestMethod.GET)
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/LatentDangerFeignClient.java
View file @ 09404f3d
......@@ -15,7 +15,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
*
* @author Dell
*/
@FeignClient(name = "${latentDanger.feign.name}", path = "latentDanger", configuration = {MultipartSupportConfig.class})
@FeignClient(name = "${latentDanger.feign.name:AMOS-LATENT-DANGER}", path = "latentDanger", configuration = {MultipartSupportConfig.class})
public interface LatentDangerFeignClient {
/**
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/SupervisionFeignClient.java
View file @ 09404f3d
......@@ -20,7 +20,7 @@ import java.util.Map;
*
* @author Dell
*/
@FeignClient(name = "${supervision.feign.name}", path = "equip", configuration = {MultipartSupportConfig.class})
@FeignClient(name = "${supervision.feign.name:AMOS-SUPERVISION-API}", path = "equip", configuration = {MultipartSupportConfig.class})
public interface SupervisionFeignClient {
/**
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/VideoFeignClient.java
View file @ 09404f3d
......@@ -14,7 +14,7 @@ import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
* @author: tw
* @createDate: 2021/10/20
*/
@FeignClient(name = "${video.fegin.name}", path = "video", configuration = {MultipartSupportConfig.class})
@FeignClient(name = "${video.fegin.name:video}", path = "video", configuration = {MultipartSupportConfig.class})
public interface VideoFeignClient {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormColumnServiceImpl.java
View file @ 09404f3d
......@@ -8,7 +8,6 @@ import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import com.yeejoin.amos.boot.biz.common.utils.Menu;
import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
import org.springframework.beans.BeanUtils;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java
View file @ 09404f3d
......@@ -55,7 +55,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
@Autowired
WorkflowFeignService workflowFeignService;
@Value("${failure.work.flow.processDefinitionKey}")
@Value("${failure.work.flow.processDefinitionKey:malfunction_repair}")
private String processDefinitionKey;
@Autowired
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java
View file @ 09404f3d
......@@ -35,8 +35,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 09404f3d
......@@ -76,9 +76,6 @@ import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import ch.qos.logback.core.joran.conditional.IfAction;
import net.bytebuddy.asm.Advice.This;
/**
* 机构/部门/人员表 服务实现类
*
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/pom.xml
View file @ 09404f3d
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>amos-boot-module-biz</artifactId>
<groupId>com.amosframework.boot</groupId>
<version>1.0.0</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>amos-boot-module-biz</artifactId>
<groupId>com.amosframework.boot</groupId>
<version>1.0.0</version>
</parent>
<artifactId>amos-boot-module-equip-biz</artifactId>
<artifactId>amos-boot-module-equip-biz</artifactId>
<name>amos-boot-module-equip-biz</name>
<name>amos-boot-module-euip-biz</name>
<dependencies>
<dependencies>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-equip-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>visual-feign-morphic</artifactId>
<version>1.6.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
<artifactId>tyboot-component-emq</artifactId>
<version>1.1.20</version>
<exclusions>
<exclusion>
<groupId>org.typroject</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>5.1.10</version>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-equip-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>visual-feign-morphic</artifactId>
<version>1.6.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
<artifactId>tyboot-component-emq</artifactId>
<version>1.1.20</version>
<exclusions>
<exclusion>
<groupId>org.typroject</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>5.1.10</version>
</dependency>
<dependency>
<groupId>org.gavaghan</groupId>
<artifactId>geodesy</artifactId>
<version>1.1.3</version>
</dependency>
</dependencies>
</dependencies>
</project>
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/DynamicFormController.java
View file @ 09404f3d
package com.yeejoin.equipmanage.controller;
import com.yeejoin.equipmanage.common.entity.DynamicFormGroup;
import com.yeejoin.equipmanage.common.entity.DynamicFormInstance;
import com.yeejoin.equipmanage.service.IDynamicFormInstanceService;
import com.yeejoin.equipmanage.service.IDynamicFormService;
import com.yeejoin.equipmanage.service.IEqDynamicFormInstanceService;
import com.yeejoin.equipmanage.service.IEqDynamicFormService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -12,8 +11,6 @@ import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import javax.servlet.http.HttpServletRequest;
/**
* 动态表单控制器
......@@ -27,17 +24,17 @@ import javax.servlet.http.HttpServletRequest;
public class DynamicFormController extends AbstractBaseController {
@Autowired
IDynamicFormInstanceService iDynamicFormInstanceService;
IEqDynamicFormInstanceService iEqDynamicFormInstanceService;
@Autowired
IDynamicFormService iDynamicFormService;
IEqDynamicFormService iEqDynamicFormService;
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "生成id及编号", notes = "创建分组及字段使用")
@PutMapping("/nextIdCode")
public Object generateSeqAndCode() {
return iDynamicFormService.nextIdCode();
return iEqDynamicFormService.nextIdCode();
}
......@@ -45,7 +42,7 @@ public class DynamicFormController extends AbstractBaseController {
@ApiOperation(value = "分组及字段查询", notes = "分组及字段查询")
@RequestMapping(value = "/groups", method = RequestMethod.GET)
public DynamicFormGroup queryGroupsAndOptions(@RequestParam Long groupId) {
return iDynamicFormService.getGroupsAndColumns(groupId);
return iEqDynamicFormService.getGroupsAndColumns(groupId);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -53,7 +50,7 @@ public class DynamicFormController extends AbstractBaseController {
@PostMapping("/save")
public DynamicFormGroup saveGroupAndColumn(@RequestBody DynamicFormGroup dynamicFormGroup) {
String orgCode = getOrgCode();
return iDynamicFormService.saveGroupAndColumn(dynamicFormGroup,orgCode);
return iEqDynamicFormService.saveGroupAndColumn(dynamicFormGroup,orgCode);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -61,7 +58,7 @@ public class DynamicFormController extends AbstractBaseController {
@GetMapping("/instance-detail")
public Object getInstanceDetail(@RequestParam(required = false) String instanceId,
@RequestParam Long groupId) {
return iDynamicFormService.getInstanceDetail(instanceId, groupId);
return iEqDynamicFormService.getInstanceDetail(instanceId, groupId);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/DynamicFormGroupController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipDynamicFormGroupController.java
View file @ 09404f3d
......@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.equipmanage.common.entity.DynamicFormGroup;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import com.yeejoin.equipmanage.common.utils.StringUtil;
import com.yeejoin.equipmanage.service.IDynamicFormGroupService;
import com.yeejoin.equipmanage.service.IEqDynamicFormGroupService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,10 +28,10 @@ import java.util.List;
@RestController
@Api(tags = "动态表单树形分组表Api")
@RequestMapping(value = "/dynamic-form-group", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public class DynamicFormGroupController extends AbstractBaseController {
public class EquipDynamicFormGroupController extends AbstractBaseController {
@Autowired
IDynamicFormGroupService iDynamicFormGroupService;
IEqDynamicFormGroupService iEqDynamicFormGroupService;
/**
......@@ -46,7 +46,7 @@ public class DynamicFormGroupController extends AbstractBaseController {
String orgCode = getOrgCode();
dynamicFormGroup.setOrgCode(orgCode);
dynamicFormGroup.setParentId(0L);
iDynamicFormGroupService.saveAndCheck(dynamicFormGroup);
iEqDynamicFormGroupService.saveAndCheck(dynamicFormGroup);
return dynamicFormGroup;
}
......@@ -60,7 +60,7 @@ public class DynamicFormGroupController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(@RequestBody List<Long> ids) {
return iDynamicFormGroupService.checkAndRemoveById(ids);
return iEqDynamicFormGroupService.checkAndRemoveById(ids);
}
......@@ -74,13 +74,13 @@ public class DynamicFormGroupController extends AbstractBaseController {
@ApiOperation(httpMethod = "PUT", value = "修改动态表单树形分组表", notes = "修改动态表单树形分组表")
public DynamicFormGroup updateByIdDynamicFormGroup(@PathVariable Long id, @RequestBody DynamicFormGroup dynamicFormGroup) {
String orgCode = getOrgCode();
DynamicFormGroup formGroup = iDynamicFormGroupService.getById(id);
DynamicFormGroup formGroup = iEqDynamicFormGroupService.getById(id);
formGroup.setGroupCode(dynamicFormGroup.getGroupCode());
formGroup.setGroupType(dynamicFormGroup.getGroupType());
formGroup.setGroupName(dynamicFormGroup.getGroupName());
formGroup.setOrgCode(orgCode);
formGroup.setCreateDate(new Date());
iDynamicFormGroupService.updateById(formGroup);
iEqDynamicFormGroupService.updateById(formGroup);
return formGroup;
}
......@@ -95,7 +95,7 @@ public class DynamicFormGroupController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public DynamicFormGroup selectById(HttpServletRequest request, @PathVariable Long id) {
return iDynamicFormGroupService.getById(id);
return iEqDynamicFormGroupService.getById(id);
}
/**
......@@ -108,7 +108,7 @@ public class DynamicFormGroupController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "查询分组不分页", notes = "查询分组不分页")
public List<DynamicFormGroup> getGroupList() {
String orgCode = getOrgCode();
return iDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
return iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
.eq(DynamicFormGroup::getOrgCode, orgCode)
.eq(DynamicFormGroup::getParentId,0)
.orderByDesc(BaseEntity::getCreateDate));
......@@ -122,7 +122,7 @@ public class DynamicFormGroupController extends AbstractBaseController {
@RequestParam long size,
@RequestParam String groupType,
@RequestParam(required = false) String systemName){
return iDynamicFormGroupService.page(new Page<>(current,size), new LambdaQueryWrapper<DynamicFormGroup>()
return iEqDynamicFormGroupService.page(new Page<>(current,size), new LambdaQueryWrapper<DynamicFormGroup>()
.eq(DynamicFormGroup::getGroupType,groupType)
.eq(DynamicFormGroup::getParentId,0)
.like(StringUtil.isNotEmpty(systemName),DynamicFormGroup::getGroupName,systemName));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SourceFileController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipSourceFileController.java
View file @ 09404f3d
......@@ -13,7 +13,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.yeejoin.equipmanage.common.entity.SourceFile;
import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
import com.yeejoin.equipmanage.service.ISourceFileService;
import com.yeejoin.equipmanage.service.IEqSourceFileService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -26,9 +26,9 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@RequestMapping("/sourceFile")
public class SourceFileController {
public class EquipSourceFileController {
@Autowired
private ISourceFileService sourceFileService;
private IEqSourceFileService sourceFileService;
/**
* @param sourceId 所属者ID
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentCategoryController.java
View file @ 09404f3d
......@@ -42,7 +42,7 @@ import com.yeejoin.equipmanage.common.utils.NameUtils;
import com.yeejoin.equipmanage.common.vo.IndustryVo;
import com.yeejoin.equipmanage.context.SpringContextHolder;
import com.yeejoin.equipmanage.event.EquipmentTreeListEvent;
import com.yeejoin.equipmanage.service.IDynamicFormGroupService;
import com.yeejoin.equipmanage.service.IEqDynamicFormGroupService;
import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
import com.yeejoin.equipmanage.service.IIndustryService;
......@@ -68,7 +68,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
@Autowired
IIndustryService iIndustryService;
@Autowired
IDynamicFormGroupService iDynamicFormGroupService;
IEqDynamicFormGroupService iEqDynamicFormGroupService;
@Autowired
private RedisUtils redisUtils;
......@@ -153,7 +153,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
public boolean updateByIdEquipmentCategory(HttpServletRequest request,
@RequestBody EquipmentCategory equipmentCategory) {
boolean updateFlag = iEquipmentCategoryService.updateById(equipmentCategory);
iDynamicFormGroupService.update(new UpdateWrapper<DynamicFormGroup>()
iEqDynamicFormGroupService.update(new UpdateWrapper<DynamicFormGroup>()
.eq("group_code", equipmentCategory.getCode()).set("group_name", equipmentCategory.getName()));
if (updateFlag) {
// 更新缓存
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/DynamicFormColumnMapper.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EqDynamicFormColumnMapper.java
View file @ 09404f3d
......@@ -9,6 +9,6 @@ import com.yeejoin.equipmanage.common.entity.DynamicFormColumn;
* @author duanwei
* @date 2021-03-08
*/
public interface DynamicFormColumnMapper extends BaseMapper<DynamicFormColumn> {
public interface EqDynamicFormColumnMapper extends BaseMapper<DynamicFormColumn> {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/DynamicFormGroupMapper.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EqDynamicFormGroupMapper.java
View file @ 09404f3d
......@@ -9,6 +9,6 @@ import com.yeejoin.equipmanage.common.entity.DynamicFormGroup;
* @author duanwei
* @date 2021-03-08
*/
public interface DynamicFormGroupMapper extends BaseMapper<DynamicFormGroup> {
public interface EqDynamicFormGroupMapper extends BaseMapper<DynamicFormGroup> {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/DynamicFormInstanceMapper.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EqDynamicFormInstanceMapper.java
View file @ 09404f3d
......@@ -9,6 +9,6 @@ import com.yeejoin.equipmanage.common.entity.DynamicFormInstance;
* @author duanwei
* @date 2021-03-08
*/
public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstance> {
public interface EqDynamicFormInstanceMapper extends BaseMapper<DynamicFormInstance> {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/SourceFileMapper.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EqSourceFileMapper.java
View file @ 09404f3d
......@@ -12,7 +12,7 @@ import java.util.List;
*
* @author DELL
*/
public interface SourceFileMapper extends BaseMapper<SourceFile> {
public interface EqSourceFileMapper extends BaseMapper<SourceFile> {
List<SourceFileVo> findImgByFileCategory(Long id, String fileCategory);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IDynamicFormColumnService.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEqDynamicFormColumnService.java
View file @ 09404f3d
......@@ -9,6 +9,6 @@ import com.yeejoin.equipmanage.common.entity.DynamicFormColumn;
* @author duanwei
* @date 2021-03-08
*/
public interface IDynamicFormColumnService extends IService<DynamicFormColumn> {
public interface IEqDynamicFormColumnService extends IService<DynamicFormColumn> {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IDynamicFormGroupService.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEqDynamicFormGroupService.java
View file @ 09404f3d
......@@ -11,7 +11,7 @@ import java.util.List;
* @author duanwei
* @date 2021-03-08
*/
public interface IDynamicFormGroupService extends IService<DynamicFormGroup> {
public interface IEqDynamicFormGroupService extends IService<DynamicFormGroup> {
boolean checkAndRemoveById(List<Long> id);
void saveAndCheck(DynamicFormGroup dynamicFormGroup);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IDynamicFormInstanceService.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEqDynamicFormInstanceService.java
View file @ 09404f3d
......@@ -11,7 +11,7 @@ import java.util.List;
* @author duanwei
* @date 2021-03-08
*/
public interface IDynamicFormInstanceService extends IService<DynamicFormInstance> {
public interface IEqDynamicFormInstanceService extends IService<DynamicFormInstance> {
/**
* 创建
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IDynamicFormService.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEqDynamicFormService.java
View file @ 09404f3d
......@@ -5,7 +5,7 @@ import com.yeejoin.equipmanage.common.entity.DynamicFormGroup;
/**
* @author DELL
*/
public interface IDynamicFormService {
public interface IEqDynamicFormService {
/**
* 生成下一个id 和编号
* @return
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ISourceFileService.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEqSourceFileService.java
View file @ 09404f3d
......@@ -9,7 +9,7 @@ import java.util.List;
/**
* @author DELL
*/
public interface ISourceFileService extends IService<SourceFile> {
public interface IEqSourceFileService extends IService<SourceFile> {
/**
* @param sourceId 所属者ID
* @Description 根据所属者ID查询所属文件并根据fileCategory分组
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/AreaServiceImpl.java
View file @ 09404f3d
......@@ -21,7 +21,7 @@ import com.yeejoin.equipmanage.mapper.AreaMapper;
import com.yeejoin.equipmanage.operation.AreaSynRiskOperator;
import com.yeejoin.equipmanage.service.IAreaService;
import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
import com.yeejoin.equipmanage.service.ISourceFileService;
import com.yeejoin.equipmanage.service.IEqSourceFileService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -44,7 +44,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
@Autowired
@Lazy
private ISourceFileService iSourceFileService;
private IEqSourceFileService iEqSourceFileService;
@Autowired
@Lazy
......@@ -182,7 +182,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
}
}
}
List<SourceFile> sourceFiles = iSourceFileService.findBySourceId(Long.parseLong(String.valueOf(map.get("id"))));
List<SourceFile> sourceFiles = iEqSourceFileService.findBySourceId(Long.parseLong(String.valueOf(map.get("id"))));
map.put("files", sourceFiles);
}
}
......@@ -221,7 +221,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
// 保存图片
long id = area.getId();
if (areaResquest.getSourceFiles() != null) {
iSourceFileService.saveSourceFile(id, areaResquest.getSourceFiles());
iEqSourceFileService.saveSourceFile(id, areaResquest.getSourceFiles());
}
// 风险同步
if (areaResquest.getRiskPointId() != null) {
......@@ -242,7 +242,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
// 保存图片
long id = area.getId();
if (areaResquest.getSourceFiles() != null) {
iSourceFileService.saveSourceFile(id, areaResquest.getSourceFiles());
iEqSourceFileService.saveSourceFile(id, areaResquest.getSourceFiles());
}
// 风险同步
//第1种情况：之前未绑定，编辑时绑定
......@@ -284,7 +284,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
@Override
public Map<String, Object> getById(Long instanceId) {
Area area = this.baseMapper.selectById(instanceId);
List<SourceFile> sourceFiles = iSourceFileService.findBySourceId(instanceId);
List<SourceFile> sourceFiles = iEqSourceFileService.findBySourceId(instanceId);
Map<String, Object> map = new HashMap<>();
map.put("area", area);
map.put("files", sourceFiles);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingAuditServiceImpl.java
View file @ 09404f3d
......@@ -12,7 +12,7 @@ import com.yeejoin.equipmanage.common.vo.BuildingAuditVO;
import com.yeejoin.equipmanage.mapper.BuildingAuditMapper;
import com.yeejoin.equipmanage.service.IBuildingAuditService;
import com.yeejoin.equipmanage.service.IFormInstanceService;
import com.yeejoin.equipmanage.service.ISourceFileService;
import com.yeejoin.equipmanage.service.IEqSourceFileService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -23,7 +23,7 @@ import java.util.List;
public class BuildingAuditServiceImpl extends ServiceImpl<BuildingAuditMapper, BuildingAudit> implements IBuildingAuditService {
@Autowired
private ISourceFileService iSourceFileService;
private IEqSourceFileService iEqSourceFileService;
@Autowired
private BuildingAuditMapper buildingAuditMapper;
......@@ -45,7 +45,7 @@ public class BuildingAuditServiceImpl extends ServiceImpl<BuildingAuditMapper, B
// 保存文件路径名称
long id = buildingAudit.getId();
if (buildingAuditVO.getAuditFile() != null) {
iSourceFileService.saveSourceFile(id, buildingAuditVO.getAuditFile());
iEqSourceFileService.saveSourceFile(id, buildingAuditVO.getAuditFile());
}
return flag;
}
......@@ -84,7 +84,7 @@ public class BuildingAuditServiceImpl extends ServiceImpl<BuildingAuditMapper, B
BuildingAudit buildingAudit = this.baseMapper.selectById(id);
BeanUtils.copyProperties(buildingAudit, buildingAuditVO);
Long sourceId = buildingAudit.getId();
buildingAuditVO.setAuditFile(iSourceFileService.findBySourceId(sourceId));
buildingAuditVO.setAuditFile(iEqSourceFileService.findBySourceId(sourceId));
return buildingAuditVO;
}
......@@ -97,7 +97,7 @@ public class BuildingAuditServiceImpl extends ServiceImpl<BuildingAuditMapper, B
List<SourceFile> list = buildingAuditVO.getAuditFile();
// 保存图片
if (list != null) {
iSourceFileService.saveSourceFile(id, list);
iEqSourceFileService.saveSourceFile(id, list);
}
return flag;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
View file @ 09404f3d
......@@ -66,7 +66,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
private IFormGroupService iFormGroupService;
@Autowired
private ISourceFileService iSourceFileService;
private IEqSourceFileService iEqSourceFileService;
@Autowired
private RemoteSecurityService remoteSecurityService;
......@@ -554,7 +554,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
String fileKey = "files";
if (map.get(fileKey) != null) {
sourceFiles = JSONObject.parseArray(JSONObject.toJSON(map.get(fileKey)).toString(), SourceFile.class);
iSourceFileService.saveSourceFile(sourceId, sourceFiles);
iEqSourceFileService.saveSourceFile(sourceId, sourceFiles);
}
}
......@@ -679,7 +679,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
*/
@Override
public void files(Map<String, Object> map) {
List<SourceFile> sourceFiles = iSourceFileService.findBySourceId(Long.parseLong(String.valueOf(map.get("instanceId"))));
List<SourceFile> sourceFiles = iEqSourceFileService.findBySourceId(Long.parseLong(String.valueOf(map.get("instanceId"))));
map.put("files", sourceFiles);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/DynamicFormColumnServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EqEqDynamicFormColumnServiceImpl.java
View file @ 09404f3d
......@@ -2,8 +2,8 @@ package com.yeejoin.equipmanage.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.equipmanage.common.entity.DynamicFormColumn;
import com.yeejoin.equipmanage.mapper.DynamicFormColumnMapper;
import com.yeejoin.equipmanage.service.IDynamicFormColumnService;
import com.yeejoin.equipmanage.mapper.EqDynamicFormColumnMapper;
import com.yeejoin.equipmanage.service.IEqDynamicFormColumnService;
import org.springframework.stereotype.Service;
/**
......@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
* @date 2021-03-08
*/
@Service
public class DynamicFormColumnServiceImpl extends ServiceImpl<DynamicFormColumnMapper, DynamicFormColumn> implements IDynamicFormColumnService {
public class EqEqDynamicFormColumnServiceImpl extends ServiceImpl<EqDynamicFormColumnMapper, DynamicFormColumn> implements IEqDynamicFormColumnService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/DynamicFormGroupServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EqEqDynamicFormGroupServiceImpl.java
View file @ 09404f3d
......@@ -8,9 +8,9 @@ import com.yeejoin.equipmanage.common.entity.DynamicFormInstance;
import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import com.yeejoin.equipmanage.common.exception.BaseException;
import com.yeejoin.equipmanage.mapper.DynamicFormGroupMapper;
import com.yeejoin.equipmanage.service.IDynamicFormGroupService;
import com.yeejoin.equipmanage.service.IDynamicFormInstanceService;
import com.yeejoin.equipmanage.mapper.EqDynamicFormGroupMapper;
import com.yeejoin.equipmanage.service.IEqDynamicFormGroupService;
import com.yeejoin.equipmanage.service.IEqDynamicFormInstanceService;
import com.yeejoin.equipmanage.service.IFireFightingSystemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -28,13 +28,13 @@ import java.util.stream.Collectors;
* @date 2021-03-08
*/
@Service
public class DynamicFormGroupServiceImpl extends ServiceImpl<DynamicFormGroupMapper, DynamicFormGroup> implements IDynamicFormGroupService {
public class EqEqDynamicFormGroupServiceImpl extends ServiceImpl<EqDynamicFormGroupMapper, DynamicFormGroup> implements IEqDynamicFormGroupService {
@Autowired
IDynamicFormInstanceService iDynamicFormInstanceService;
IEqDynamicFormInstanceService iEqDynamicFormInstanceService;
@Autowired
IDynamicFormGroupService iDynamicFormGroupService;
IEqDynamicFormGroupService iEqDynamicFormGroupService;
@Autowired
......@@ -51,7 +51,7 @@ public class DynamicFormGroupServiceImpl extends ServiceImpl<DynamicFormGroupMap
int useNum = 0;
//2.校验是否在使用
if (!CollectionUtils.isEmpty(cids)) {
useNum = iDynamicFormInstanceService.count(new LambdaQueryWrapper<DynamicFormInstance>().in(DynamicFormInstance::getGroupId, cids));
useNum = iEqDynamicFormInstanceService.count(new LambdaQueryWrapper<DynamicFormInstance>().in(DynamicFormInstance::getGroupId, cids));
}
useNum +=iFireFightingSystemService.count(new QueryWrapper<FireFightingSystemEntity>().eq("form_group_id",id));
if (useNum > 0) {
......@@ -59,7 +59,7 @@ public class DynamicFormGroupServiceImpl extends ServiceImpl<DynamicFormGroupMap
}
//删除子表
if (cids != null && cids.size() > 0) {
iDynamicFormGroupService.removeByIds(cids);
iEqDynamicFormGroupService.removeByIds(cids);
}
//删除主表
re = this.removeById(id);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/DynamicFormInstanceServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EqEqDynamicFormInstanceServiceImpl.java
View file @ 09404f3d
......@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.equipmanage.common.entity.DynamicFormInstance;
import com.yeejoin.equipmanage.common.exception.BaseException;
import com.yeejoin.equipmanage.mapper.DynamicFormInstanceMapper;
import com.yeejoin.equipmanage.service.IDynamicFormInstanceService;
import com.yeejoin.equipmanage.mapper.EqDynamicFormInstanceMapper;
import com.yeejoin.equipmanage.service.IEqDynamicFormInstanceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -20,7 +20,7 @@ import java.util.List;
* @date 2021-03-08
*/
@Service
public class DynamicFormInstanceServiceImpl extends ServiceImpl<DynamicFormInstanceMapper, DynamicFormInstance> implements IDynamicFormInstanceService {
public class EqEqDynamicFormInstanceServiceImpl extends ServiceImpl<EqDynamicFormInstanceMapper, DynamicFormInstance> implements IEqDynamicFormInstanceService {
@Autowired
Sequence sequence;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/DynamicFormServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EqEqDynamicFormServiceImpl.java
View file @ 09404f3d
......@@ -12,10 +12,10 @@ import com.yeejoin.equipmanage.common.exception.BaseException;
import com.yeejoin.equipmanage.common.utils.CodeGenerate;
import com.yeejoin.equipmanage.common.utils.StringUtil;
import com.yeejoin.equipmanage.common.vo.DynamicFormGroupVo;
import com.yeejoin.equipmanage.service.IDynamicFormColumnService;
import com.yeejoin.equipmanage.service.IDynamicFormGroupService;
import com.yeejoin.equipmanage.service.IDynamicFormInstanceService;
import com.yeejoin.equipmanage.service.IDynamicFormService;
import com.yeejoin.equipmanage.service.IEqDynamicFormColumnService;
import com.yeejoin.equipmanage.service.IEqDynamicFormGroupService;
import com.yeejoin.equipmanage.service.IEqDynamicFormInstanceService;
import com.yeejoin.equipmanage.service.IEqDynamicFormService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
......@@ -29,19 +29,19 @@ import java.util.stream.Collectors;
* @author DELL
*/
@Service
public class DynamicFormServiceImpl implements IDynamicFormService {
public class EqEqDynamicFormServiceImpl implements IEqDynamicFormService {
@Autowired
Sequence sequence;
@Autowired
IDynamicFormGroupService iDynamicFormGroupService;
IEqDynamicFormGroupService iEqDynamicFormGroupService;
@Autowired
IDynamicFormColumnService iDynamicFormColumnService;
IEqDynamicFormColumnService iEqDynamicFormColumnService;
@Autowired
IDynamicFormInstanceService iDynamicFormInstanceService;
IEqDynamicFormInstanceService iEqDynamicFormInstanceService;
@Override
public Object nextIdCode() {
......@@ -54,7 +54,7 @@ public class DynamicFormServiceImpl implements IDynamicFormService {
@Override
public DynamicFormGroup getGroupsAndColumns(Long groupId) {
//0.前置校验
DynamicFormGroup dynamicFormGroup = iDynamicFormGroupService.getById(groupId);
DynamicFormGroup dynamicFormGroup = iEqDynamicFormGroupService.getById(groupId);
if (dynamicFormGroup == null) {
throw new BaseException("分组信息不存在");
}
......@@ -89,12 +89,12 @@ public class DynamicFormServiceImpl implements IDynamicFormService {
//2.1需要保存的分组数据
List<DynamicFormGroup> saveGroups = formGroupMap.get(false);
if (saveGroups != null && !saveGroups.isEmpty()) {
iDynamicFormGroupService.saveOrUpdateBatch(saveGroups);
iEqDynamicFormGroupService.saveOrUpdateBatch(saveGroups);
}
//2.2需要删除的分组数据
List<DynamicFormGroup> deleteGroups = formGroupMap.get(true);
if (deleteGroups != null && !deleteGroups.isEmpty()) {
iDynamicFormGroupService.removeByIds(deleteGroups.stream().map(BaseEntity::getId).collect(Collectors.toList()));
iEqDynamicFormGroupService.removeByIds(deleteGroups.stream().map(BaseEntity::getId).collect(Collectors.toList()));
}
//3.字段的删除或者保存
Map<Boolean, List<DynamicFormColumn>> formColumnMap = formColumns.stream().collect(Collectors.groupingBy(DynamicFormColumn::getIsDelete, Collectors.mapping(g -> {
......@@ -105,12 +105,12 @@ public class DynamicFormServiceImpl implements IDynamicFormService {
//3.1保存的字段数据
List<DynamicFormColumn> saveFormColumns = formColumnMap.get(false);
if (saveFormColumns != null && !saveFormColumns.isEmpty()) {
iDynamicFormColumnService.saveOrUpdateBatch(saveFormColumns);
iEqDynamicFormColumnService.saveOrUpdateBatch(saveFormColumns);
}
//3.2删除的字段数据
List<DynamicFormColumn> deleteFormColumns = formColumnMap.get(true);
if (deleteFormColumns != null && !deleteFormColumns.isEmpty()) {
iDynamicFormColumnService.removeByIds(deleteFormColumns.stream().map(BaseEntity::getId).collect(Collectors.toList()));
iEqDynamicFormColumnService.removeByIds(deleteFormColumns.stream().map(BaseEntity::getId).collect(Collectors.toList()));
}
return this.getGroupsAndColumns(dynamicFormGroup.getId());
}
......@@ -120,14 +120,14 @@ public class DynamicFormServiceImpl implements IDynamicFormService {
//1.查询实例信息
List<DynamicFormInstance> dynamicFormInstances = new ArrayList<>();
if (StringUtil.isNotEmpty(instanceId)) {
dynamicFormInstances = iDynamicFormInstanceService.list(new QueryWrapper<DynamicFormInstance>().lambda().eq(DynamicFormInstance::getInstanceId, instanceId));
dynamicFormInstances = iEqDynamicFormInstanceService.list(new QueryWrapper<DynamicFormInstance>().lambda().eq(DynamicFormInstance::getInstanceId, instanceId));
}
//2.组织树数据，wl_dynamic_form_group 树结构，填充字段及字段对应value
return this.getGroupsAndColumnsWithValue(groupId, dynamicFormInstances);
}
private DynamicFormGroupVo getGroupsAndColumnsWithValue(Long groupId, List<DynamicFormInstance> dynamicFormInstances) {
DynamicFormGroup dynamicFormGroup = iDynamicFormGroupService.getById(groupId);
DynamicFormGroup dynamicFormGroup = iEqDynamicFormGroupService.getById(groupId);
if (dynamicFormGroup == null) {
throw new BaseException("分组信息不存在");
}//0.对象转换
......@@ -145,7 +145,7 @@ public class DynamicFormServiceImpl implements IDynamicFormService {
//2.填充字段数据
this.fillFormColumnWithFiledValue(dynamicFormGroupVo, formInstanceMap);
//3.处理子分组数据
List<DynamicFormGroup> groupList = iDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
List<DynamicFormGroup> groupList = iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
.eq(DynamicFormGroup::getParentId, dynamicFormGroupVo.getId()).orderByAsc(DynamicFormGroup::getSort));
List<DynamicFormGroupVo> formGroupVos = groupList.stream().map(s -> {
this.stringToJsonGroupConfig(s);
......@@ -161,7 +161,7 @@ public class DynamicFormServiceImpl implements IDynamicFormService {
}
private void fillFormColumnWithFiledValue(DynamicFormGroupVo dynamicFormGroupVo, Map<Long, DynamicFormInstance> formInstanceMap) {
List<DynamicFormColumn> formColumns = iDynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>()
List<DynamicFormColumn> formColumns = iEqDynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>()
.eq(DynamicFormColumn::getGroupId, dynamicFormGroupVo.getId()));
//将行数据转为实例数据，使新增及编辑时，返回前端的数据结构统一
List<DynamicFormInstance> formInstances = formColumns.stream().map(f -> {
......@@ -189,7 +189,7 @@ public class DynamicFormServiceImpl implements IDynamicFormService {
private void buildGroupTreeWithColumn(DynamicFormGroup dynamicFormGroup) {
this.fillFormColumns(dynamicFormGroup);
List<DynamicFormGroup> groupList = iDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
List<DynamicFormGroup> groupList = iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
.eq(DynamicFormGroup::getParentId, dynamicFormGroup.getId()).orderByAsc(DynamicFormGroup::getSort));
groupList.forEach(g -> {
this.fillFormColumns(g);
......@@ -200,7 +200,7 @@ public class DynamicFormServiceImpl implements IDynamicFormService {
}
private void fillFormColumns(DynamicFormGroup dynamicFormGroup) {
List<DynamicFormColumn> columnList = iDynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>()
List<DynamicFormColumn> columnList = iEqDynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>()
.eq(DynamicFormColumn::getGroupId, dynamicFormGroup.getId()).orderByAsc(DynamicFormColumn::getGroupId));
dynamicFormGroup.setFormColumns(columnList);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SourceFileServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EqSourceFileServiceImpl.java
View file @ 09404f3d
......@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.yeejoin.equipmanage.common.entity.SourceFile;
import com.yeejoin.equipmanage.common.vo.SourceFileVo;
import com.yeejoin.equipmanage.mapper.SourceFileMapper;
import com.yeejoin.equipmanage.service.ISourceFileService;
import com.yeejoin.equipmanage.mapper.EqSourceFileMapper;
import com.yeejoin.equipmanage.service.IEqSourceFileService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -22,13 +22,13 @@ import java.util.*;
*/
@Slf4j
@Service
public class SourceFileServiceImpl extends ServiceImpl<SourceFileMapper, SourceFile> implements ISourceFileService {
public class EqSourceFileServiceImpl extends ServiceImpl<EqSourceFileMapper, SourceFile> implements IEqSourceFileService {
@Autowired
private Sequence sequence;
@Autowired
private SourceFileMapper sourceFileMapper;
private EqSourceFileMapper eqSourceFileMapper;
/**
* @param sourceId 所属者ID
......@@ -70,7 +70,7 @@ public class SourceFileServiceImpl extends ServiceImpl<SourceFileMapper, SourceF
@Override
public List<SourceFileVo> findImgByFileCategory(Long id, String fileCategory) {
List<SourceFileVo> list = sourceFileMapper.findImgByFileCategory(id, fileCategory);
List<SourceFileVo> list = eqSourceFileMapper.findImgByFileCategory(id, fileCategory);
if (!CollectionUtils.isEmpty(list)) {
return list;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java
View file @ 09404f3d
......@@ -12,7 +12,7 @@ import com.yeejoin.equipmanage.controller.EquipmentCategoryController;
import com.yeejoin.equipmanage.mapper.EquipmentManageMapper;
import com.yeejoin.equipmanage.remote.RemoteSecurityService;
import com.yeejoin.equipmanage.service.EquipmentManageService;
import com.yeejoin.equipmanage.service.IDynamicFormGroupService;
import com.yeejoin.equipmanage.service.IEqDynamicFormGroupService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
......@@ -20,22 +20,13 @@ import org.springframework.stereotype.Service;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.zip.ZipOutputStream;
/**
* 服务类
......@@ -64,7 +55,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
@Autowired
IDynamicFormGroupService iDynamicFormGroupService;
IEqDynamicFormGroupService iEqDynamicFormGroupService;
@Value("${equipment.fire.systemid}")
......@@ -93,7 +84,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
Map map = new HashMap<String, Object>();
List<EquipmentManageVo> utils = equipmentManageMapper.getUtils();
List<DynamicFormGroup> list = iDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
.eq(DynamicFormGroup::getOrgCode, orgCode)
.eq(DynamicFormGroup::getParentId, 0)
.orderByDesc(BaseEntity::getCreateDate));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ 09404f3d
......@@ -73,8 +73,8 @@ import com.yeejoin.equipmanage.mapper.FormInstanceMapper;
import com.yeejoin.equipmanage.mapper.SourceSceneMapper;
import com.yeejoin.equipmanage.remote.RemoteSecurityService;
import com.yeejoin.equipmanage.service.EquipmentManageService;
import com.yeejoin.equipmanage.service.IDynamicFormGroupService;
import com.yeejoin.equipmanage.service.IDynamicFormInstanceService;
import com.yeejoin.equipmanage.service.IEqDynamicFormGroupService;
import com.yeejoin.equipmanage.service.IEqDynamicFormInstanceService;
import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
import com.yeejoin.equipmanage.service.IFireFightingSystemService;
import com.yeejoin.equipmanage.service.IRiskSourceSceneService;
......@@ -121,10 +121,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
private String iotCoreParam;
@Autowired
private IDynamicFormGroupService iDynamicFormGroupService;
private IEqDynamicFormGroupService iEqDynamicFormGroupService;
@Autowired
private IDynamicFormInstanceService instanceService;
private IEqDynamicFormInstanceService instanceService;
@Autowired
@Lazy
......@@ -209,7 +209,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
vo.setId(s);
vo.setRecUserId(userId);
vo.setSort(s);
DynamicFormGroup dynamicFormGroup = iDynamicFormGroupService.getById(vo.getFormGroupId());
DynamicFormGroup dynamicFormGroup = iEqDynamicFormGroupService.getById(vo.getFormGroupId());
vo.setSystemType(dynamicFormGroup.getRelationId() != null ? dynamicFormGroup.getRelationId().toString() : "");
// fireSystemId 为字典表火灾系统id 以此确保第一个生成的火灾报警系统排序为1
if (vo.getSystemType().equals(fireSystemId)) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FormInstanceServiceImpl.java
View file @ 09404f3d
......@@ -57,7 +57,7 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
@Autowired
private FormInstanceMapper formInstanceMapper;
@Autowired
private ISourceFileService sourceFileService;
private IEqSourceFileService sourceFileService;
@Autowired
IWarehouseStructureService iWarehouseStructureService;
@Autowired
......
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @ 09404f3d
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.10.85:3306/autosys_business_v3.0.0.2?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.url = jdbc:mysql://172.16.10.85:3306/autosys_business_v4.0.0.1?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=Amos2019Mysql8
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
......@@ -18,6 +18,13 @@ fileserver_domain=http://39.98.246.31:8888/
eureka.instance.hostname= 172.16.11.20
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
#es
biz.elasticsearch.address=172.16.10.66
spring.data.elasticsearch.cluster-name=elasticsearch
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
jcs.company.topic.add=jcs/company/topic/add
jcs.company.topic.delete=jcs/company/topic/delete
#security config
security.password=a1234560
......
amos-boot-system-equip/src/main/resources/application-docker.properties deleted 100644 → 0
View file @ 1b48627c
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.11.20:3306/autosys_business_v3.0.0.2?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= root_123
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
spring.datasource.hikari.maximum-pool-size= 30
spring.datasource.hikari.auto-commit= true
spring.datasource.hikari.idle-timeout= 10000
spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout= 30000
spring.datasource.hikari.connection-test-query= SELECT 1
# 文件服务器地址
fileserver_domain=http://39.98.246.31:8888/
eureka.instance.hostname= 172.16.11.20
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
#security config
security.password=a1234560
security.loginId=fas_system
security.productApp=STUDIO_APP_MOBILE
security.productWeb=STUDIO_APP_WEB
security.appKeyApp=studio_normalapp_3056965
#redis
spring.redis.database=1
spring.redis.host=172.16.11.20
spring.redis.port=6379
spring.redis.password=1234560
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.33:1883
emqx.user-name=admin
emqx.password=public
mqtt.scene.host=mqtt://172.16.11.33:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
#数据同步开关
systemctl.sync.switch=false
#数据JCS开关
systemctl.jcs.switch=false
#平台数据开关
systemctl.amos.switch=false
#报表数据地址
equip.report.url=/fire-fighting-system/ureport/preview?_u=file:
#数字化南瑞平台接口
dcs.url.token=http://198.87.103.158:8001/auth-service/oauth/token
dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
#系统上线时间
param.system.online.date = 2019-02-12
# 视频转码服务开关 off/on,默认关闭，数字换流站使用时开启
param.isUseVideoTranscoding = off
# 航天视频服务地址
param.htvideo.url="";
# 南瑞视频转码服务地址
param.nrvideo.url="";
amos-boot-system-equip/src/main/resources/application-jcs.properties deleted 100644 → 0
View file @ 1b48627c
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.10.66:3306/safety-business-3.0.1?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= root_123
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
spring.datasource.hikari.maximum-pool-size= 30
spring.datasource.hikari.auto-commit= true
spring.datasource.hikari.idle-timeout= 10000
spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout= 30000
spring.datasource.hikari.connection-test-query= SELECT 1
fdfs.so-timeout=1501
fdfs.connect-timeout=601
fdfs.thumb-image.height=200
fdfs.thumb-image.width=200
fdfs.tracker-list[0]=39.98.246.31:22122
# 文件服务器地址
fileserver_domain=http://39.98.246.31:8888/
eureka.instance.hostname= 172.16.10.72
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
#security config
security.password=a1234560
security.loginId=fas_system
security.productApp=STUDIO_APP_MOBILE
security.productWeb=STUDIO_APP_WEB
security.appKeyApp=studio_normalapp_3157169
#redis
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
mqtt.scene.host=mqtt://172.16.10.85:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
#数据同步开关
systemctl.sync.switch=false
#数据JCS开关
systemctl.jcs.switch=true
#平台数据开关
systemctl.amos.switch=true
#报表数据地址
equip.report.url=/fire-fighting-system/ureport/preview?_u=file:
#数字化南瑞平台接口
dcs.url.token=http://198.87.103.158:8001/auth-service/oauth/token
dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
#系统上线时间
param.system.online.date = 2019-02-12
# 视频转码服务开关 off/on,默认关闭，数字换流站使用时开启
param.isUseVideoTranscoding = off
# 航天视频服务地址
param.htvideo.url="";
# 南瑞视频转码服务地址
param.nrvideo.url="";
amos-boot-system-equip/src/main/resources/application-qa.properties deleted 100644 → 0
View file @ 1b48627c
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.11.20:3306/autosys_business_v3.0.0.2?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= root_123
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
spring.datasource.hikari.maximum-pool-size= 30
spring.datasource.hikari.auto-commit= true
spring.datasource.hikari.idle-timeout= 10000
spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout= 30000
spring.datasource.hikari.connection-test-query= SELECT 1
# 文件服务器地址
fileserver_domain=http://39.98.246.31:8888/
eureka.instance.hostname= 172.16.11.20
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
#security config
security.password=a1234560
security.loginId=fas_system
security.productApp=STUDIO_APP_MOBILE
security.productWeb=STUDIO_APP_WEB
security.appKeyApp=studio_normalapp_3056965
#redis
spring.redis.database=1
spring.redis.host=172.16.11.20
spring.redis.port=6379
spring.redis.password=1234560
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.33:1883
emqx.user-name=admin
emqx.password=public
mqtt.scene.host=mqtt://172.16.11.33:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
#数据同步开关
systemctl.sync.switch=false
#数据JCS开关
systemctl.jcs.switch=false
#平台数据开关
systemctl.amos.switch=false
#报表数据地址
equip.report.url=/fire-fighting-system/ureport/preview?_u=file:
#数字化南瑞平台接口
dcs.url.token=http://198.87.103.158:8001/auth-service/oauth/token
dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
#系统上线时间
param.system.online.date = 2019-02-12
# 视频转码服务开关 off/on,默认关闭，数字换流站使用时开启
param.isUseVideoTranscoding = off
# 航天视频服务地址
param.htvideo.url="";
# 南瑞视频转码服务地址
param.nrvideo.url="";
amos-boot-system-equip/src/main/resources/application-test.properties deleted 100644 → 0
View file @ 1b48627c
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.11.20:3306/autosys_business_v3.0.0.2?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= root_123
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
spring.datasource.hikari.maximum-pool-size= 30
spring.datasource.hikari.auto-commit= true
spring.datasource.hikari.idle-timeout= 10000
spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout= 30000
spring.datasource.hikari.connection-test-query= SELECT 1
# 文件服务器地址
fileserver_domain=http://39.98.246.31:8888/
eureka.instance.hostname= 172.16.11.20
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
#security config
security.password=a1234560
security.loginId=fas_system
security.productApp=STUDIO_APP_MOBILE
security.productWeb=STUDIO_APP_WEB
security.appKeyApp=studio_normalapp_3056965
#redis
spring.redis.database=1
spring.redis.host=172.16.11.20
spring.redis.port=6379
spring.redis.password=1234560
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.33:1883
emqx.user-name=admin
emqx.password=public
mqtt.scene.host=mqtt://172.16.11.33:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
#报表数据地址
equip.report.url=/fire-fighting-system/ureport/preview?_u=file:
#数字化南瑞平台接口
dcs.url.token=http://198.87.103.158:8001/auth-service/oauth/token
dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
#系统上线时间
param.system.online.date = 2019-02-12
# 视频转码服务开关 off/on,默认关闭，数字换流站使用时开启
param.isUseVideoTranscoding = off
# 航天视频服务地址
param.htvideo.url="";
# 南瑞视频转码服务地址
param.nrvideo.url="";
amos-boot-system-equip/src/main/resources/mapper/DynamicFormColumnMapper.xml → amos-boot-system-equip/src/main/resources/mapper/EqDynamicFormColumnMapper.xml
View file @ 09404f3d
<?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.equipmanage.mapper.DynamicFormColumnMapper">
<mapper namespace="com.yeejoin.equipmanage.mapper.EqDynamicFormColumnMapper">
</mapper>
amos-boot-system-equip/src/main/resources/mapper/DynamicFormGroupMapper.xml → amos-boot-system-equip/src/main/resources/mapper/EqDynamicFormGroupMapper.xml
View file @ 09404f3d
<?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.equipmanage.mapper.DynamicFormGroupMapper">
<mapper namespace="com.yeejoin.equipmanage.mapper.EqDynamicFormGroupMapper">
</mapper>
amos-boot-system-equip/src/main/resources/mapper/DynamicFormInstanceMapper.xml → amos-boot-system-equip/src/main/resources/mapper/EqDynamicFormInstanceMapper.xml
View file @ 09404f3d
<?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.equipmanage.mapper.DynamicFormInstanceMapper">
<mapper namespace="com.yeejoin.equipmanage.mapper.EqDynamicFormInstanceMapper">
</mapper>
amos-boot-system-equip/src/main/resources/mapper/SourceFileMapper.xml → amos-boot-system-equip/src/main/resources/mapper/EqSourceFileMapper.xml
View file @ 09404f3d
<?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.equipmanage.mapper.SourceFileMapper">
<mapper namespace="com.yeejoin.equipmanage.mapper.EqSourceFileMapper">
<select id="findImgByFileCategory" resultType="com.yeejoin.equipmanage.common.vo.SourceFileVo">
SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment