Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DynamicFormInitDto.java

@@ -37,10 +37,13 @@ public class DynamicFormInitDto implements Serializable{
     @ApiModelProperty(value = "提交表单附加字段")
     private DynamicFormInstanceDto   formItemDescr;
     
-    @ApiModelProperty(value = "接口地址")
+    @ApiModelProperty(value = "配置")
     private String columnConfig;
     
     private int sort;
+
+  @ApiModelProperty(value = "接口地址")
+  private String url;
     
 	public DynamicFormInitDto() {
 		

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/UserUnitDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 单位归属
+ *
+ * @author gaojianqiang
+ * @date 2021-08-19
+ */
+@Data
+@ApiModel(value = "UserUnitDto", description = "用户单位归属")
+public class UserUnitDto {
+
+    @ApiModelProperty(value = "人员类型1-维保公司；2-业主单位")
+    private String identityType;
+
+    @ApiModelProperty(value = "人员id")
+    private String personSeq;
+
+    @ApiModelProperty(value = "人员名称")
+    private String personName;
+
+    @ApiModelProperty(value = "公司id")
+    private String companyId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/UserUnitTypeEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum UserUnitTypeEnum {
+    MAINTENANCE_COMPANY("1", "维保公司"),
+    OWNER_UNIT("2", "业主单位");
+
+    private String value;
+    private String name;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -68,4 +68,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
      * 查询单位基本信息列表和单位下所有的重点部位数量。
      */
     List<OrgUsrTreeDto> getCompanyAndKeySite(Long companyId);
+
+    List<UserUnitDto>  getUserUnit(String id, String type, String code);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

 package com.yeejoin.amos.boot.module.common.api.service;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 机构/部门/人员表 服务类
@@ -18,163 +16,172 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
  * @date 2021-06-18
  */
 public interface IOrgUsrService {
-	/**
-	 * 查询上级单位
-	 * @param parent_id
-	 * @return
-	 */
+    /**
+     * 查询上级单位
+     *
+     * @param parent_id
+     * @return
+     */
     String selectUpUnitByParam(String parent_id);
 
-	/**
-	 * 获取父级
-	 * @param topId
-	 * @param entityList
-	 * @param packageURL
-	 * @param IDMethodName
-	 * @param IDHierarchy
-	 * @param NAMEMethodName
-	 * @param PARENTIDMethodName
-	 * @param OrgTypeMethodName
-	 * @return
-	 * @throws Exception
-	 */
-	List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
-							String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
+    /**
+     * 获取父级
+     *
+     * @param topId
+     * @param entityList
+     * @param packageURL
+     * @param IDMethodName
+     * @param IDHierarchy
+     * @param NAMEMethodName
+     * @param PARENTIDMethodName
+     * @param OrgTypeMethodName
+     * @return
+     * @throws Exception
+     */
+    List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
+                             String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
+
+    /**
+     * 获取子数据集合
+     *
+     * @param topId
+     * @param entityList
+     * @param packageURL
+     * @param IDMethodName
+     * @param IDHierarchy
+     * @param NAMEMethodName
+     * @param PARENTIDMethodName
+     * @param OrgTypeMethodName
+     * @return
+     * @throws Exception
+     */
+    List<OrgMenuDto> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
+                            String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
+
+    /**
+     * 组装融合调度单位人员信息
+     *
+     * @param ids
+     * @return
+     * @throws Exception
+     */
+    List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception;
+
+    /**
+     * 获取动态表单数据
+     *
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    List<FormValue> getFormValue(Long id) throws Exception;
+
+    /**
+     * 保存 机构/部门/人员基本信息
+     *
+     * @param
+     * @throws Exception
+     */
+    void saveOrgUsr(OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception;
+
+    /**
+     * 新增机构/部门/人员基本信息和动态表单数据
+     *
+     * @param orgUsr
+     * @param alertFromValuelist
+     */
+    void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception;
+
+    /**
+     * 更新机构/部门/人员基本信息和动态表单数据
+     *
+     * @param instanceId    实例id
+     * @param fromValueList 动态表单数据列表
+     * @throws Exception
+     */
+    void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList) throws Exception;
+
+    /**
+     * @param id
+     * @throws Exception
+     */
+    Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception;
+
+    List<OrgUsr> selectCompanyDepartmentMsg();
+
+    void saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
+
+    void saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
+
+    void updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
+
+    void updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
+
+    OrgUsrFormDto selectCompanyById(Long id) throws Exception;
+
+    IPage bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception;
+
+    void saveDepartment(List<OrgDepartmentDto> OrgDepartmentDto, Long id) throws Exception;
+
+    void saveCompany(List<OrgUsrDto> OrgUsrDto) throws Exception;
+
+    OrgPersonFormDto selectPersonById(Long id) throws Exception;
+
+    OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception;
+
+    List<OrgMenuDto> selectPersonTree() throws Exception;
+
+    void savePersonList(List<OrgPersonDto> OrgPersonDto) throws Exception;
+
+    void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
+
+    void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
+
+    OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
+
+    List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception;
+
+
+    /**
+     * * @param null
+     *
+     * @return <PRE>
+     * author tw
+     * date 2021/7/20
+     * </PRE>
+     * 列表
+     */
+    List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
 
-	/**
-	 * 获取子数据集合
-	 * @param topId
-	 * @param entityList
-	 * @param packageURL
-	 * @param IDMethodName
-	 * @param IDHierarchy
-	 * @param NAMEMethodName
-	 * @param PARENTIDMethodName
-	 * @param OrgTypeMethodName
-	 * @return
-	 * @throws Exception
-	 */
-	List<OrgMenuDto> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
-			String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
+    /**
+     * * @param null
+     *
+     * @return <PRE>
+     * author tw
+     * date 2021/7/20
+     * </PRE>
+     * 统计
+     */
+    Integer listContractDtoCount(RequestData par);
 
-	/**
-	 * 组装融合调度单位人员信息
-	 * @param ids
-	 * @return
-	 * @throws Exception
-	 */
-	List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception;
+    /**
+     * * @param null
+     *
+     * @return <PRE>
+     * author tw
+     * date 2021/7/26
+     * </PRE>
+     */
 
-	/**
-	 * 获取动态表单数据
-	 * @param  id
-	 * @return
-	 * @throws Exception
-	 */
-	List<FormValue> getFormValue(Long id) throws Exception;
+    List<OrgUsrzhDto> getOrgUsrzhDto(String name);
 
-	/**
-	 * 保存 机构/部门/人员基本信息
-	 * @param
-	 * @throws Exception
-	 */
-	void saveOrgUsr (OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception;
+    List<ESOrgUsrDto> selectByIddata(String name);
 
-	/**
-	 * 新增机构/部门/人员基本信息和动态表单数据
-	 * @param orgUsr
-	 * @param alertFromValuelist
-	 */
-	void saveOrgUsrDynamicFormInstance (OrgUsr orgUsr,List<DynamicFormInstance> alertFromValuelist)throws Exception;
+    List<Map<String, Object>> getparent();
 
-	/**
-	 * 更新机构/部门/人员基本信息和动态表单数据
-	 *
-	 * @param instanceId 实例id
-	 * @param fromValueList 动态表单数据列表
-	 * @throws Exception
-	 */
-	void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList)throws Exception;
+    List<OrgUsrExcelDto> exportToExcel();
 
-	/**
-	 *
-	 * @param id
-	 * @throws Exception
-	 */
-	Map<String, Object> selectForShowById (OrgUsr orgUsr,Long id) throws Exception;
-
-	List<OrgUsr> selectCompanyDepartmentMsg();
-
-	void saveOrgUsr( OrgUsrDto OrgUsrDto) throws Exception;
-
-	void saveOrgPerson( OrgPersonDto OrgPersonDto) throws Exception;
-
-	void updateByIdOrgUsr(OrgUsrDto OrgUsrDto,Long id) throws Exception;
-
-	void updateByIdOrgPerson(OrgPersonDto OrgPersonDto,Long id) throws Exception;
-
-	OrgUsrFormDto selectCompanyById(Long id) throws Exception;
-
-	IPage bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception;
-
-	void saveDepartment(List<OrgDepartmentDto> OrgDepartmentDto, Long id)throws Exception;
-
-	void saveCompany(List<OrgUsrDto> OrgUsrDto)throws Exception;
-
-	OrgPersonFormDto selectPersonById(Long id) throws Exception;
-
-	OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception;
-
-	List<OrgMenuDto> selectPersonTree() throws Exception;
-
-	void savePersonList (List <OrgPersonDto> OrgPersonDto)throws Exception;
-
-	void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
-
-	void updateByIdOrgDepartment ( OrgDepartmentDto OrgDepartmentDto,Long id) throws Exception;
-
-	OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
-
-	List<Map<String, Object>>  selectForShowByListId(List<Long> ids) throws Exception;
-
-
-	/**
-	 * * @param null
-	 * @return
-	 * <PRE>
-	 * author tw
-	 * date 2021/7/20
-	 * </PRE>
-	 * 列表
-	 */
-	List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
-	/**
-	 * * @param null
-	 * @return
-	 * <PRE>
-	 * author tw
-	 * date 2021/7/20
-	 * </PRE>
-	 * 统计
-	 */
-	Integer listContractDtoCount(RequestData par);
-
-     /**
-      * * @param null
-      * @return
-      * <PRE>
-      * author tw
-      * date 2021/7/26
-      * </PRE>
-      */
-
-	List<OrgUsrzhDto> getOrgUsrzhDto(String  name);
-	
-	
-	List<ESOrgUsrDto> selectByIddata(String name);
-
-	List< Map<String,Object>> getparent();
-	List< OrgUsrExcelDto> exportToExcel();
+    UserUnitDto getUserUnit(String id, String type, String code);
 
 	/**
 	 * 根据登陆人获取公司部门人员树

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -307,8 +307,28 @@ LEFT JOIN (
       FROM important_companys
 
     </select>
-
-
+    <select id="getUserUnit" resultType="com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto">
+        SELECT
+            u.sequence_nbr AS personSeq,
+            u.biz_org_name AS personName,
+            '2' AS identityType,
+            IFNULL( LEFT ( u.biz_org_code, 6 ), '' ) AS companyId
+        FROM
+            `cb_org_usr` u
+        <where>
+            <if test="id != null and id != ''">
+                u.amos_org_id = #{id}
+            </if>
+            <if test="type != null and type != ''">
+                AND u.biz_org_type = #{type}
+            </if>
+            <if test="code != null and code != ''">
+                AND u.biz_org_code LIKE CONCAT(#{code}, '%')
+            </if>
+        </where>
+        ORDER BY
+            u.sequence_nbr DESC
+    </select>
     <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto">
          select
     a.biz_org_name bizOrgName,

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

@@ -66,6 +66,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 
     		QueryWrapper<DynamicFormColumn> queryWrapper = new QueryWrapper<>();
     		queryWrapper.eq("group_code", code);
+				queryWrapper.eq("is_delete", false);
     		queryWrapper.orderByAsc("sort");
     		List<DynamicFormColumn> dynamicFormColumn = this.list(queryWrapper);
     		List<DynamicFormInitDto> listForm = new ArrayList<DynamicFormInitDto>();
@@ -76,9 +77,9 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
     					dynamicForm.getFieldType().equals("string") || 
     					dynamicForm.getFieldType().equals("datetime") || 
     					dynamicForm.getFieldType().equals("textarea") || 
-    					dynamicForm.getFieldType().equals("upload") || 
-    					dynamicForm.getFieldType().equals("tagging") || 
-    					dynamicForm.getFieldType().equals("inputBitmap")) {
+    					dynamicForm.getFieldType().equals("upload") ||
+							dynamicForm.getFieldType().equals("tagging") ||
+							dynamicForm.getFieldType().equals("inputBitmap")) {
 
     				DynamicFormInitDto vo = new DynamicFormInitDto(dynamicForm.getFieldCode(), dynamicForm.getFieldName(),
     						dynamicForm.getFieldType(), new SelectItems(), null);
@@ -161,6 +162,20 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				vo.setSort(dynamicFormValue.getSort());
 	    				listForm.add(vo);
 						break;
+						case "url":
+								vo = new DynamicFormInitDto(dynamicForm.getFieldCode(), dynamicForm.getFieldName(),
+										dynamicForm.getFieldType(), new SelectItems(new ArrayList<>()), columnConfigJson.toJSONString());
+							  vo.setUrl(columnConfigJson.getString("url"));
+								dynamicFormValue = new DynamicFormInstanceDto();
+								BeanUtils.copyProperties(dynamicForm, dynamicFormValue);
+								dynamicFormValue.setSequenceNbr(null);
+								dynamicFormValue.setFormColumnId(dynamicForm.getSequenceNbr());
+								dynamicFormValue.setAppKey(appKey);
+
+								vo.setFormItemDescr(dynamicFormValue);
+								vo.setSort(dynamicFormValue.getSort());
+								listForm.add(vo);
+								break;
 					default:
 						vo = new DynamicFormInitDto(dynamicForm.getFieldCode(), dynamicForm.getFieldName(),
 	    						dynamicForm.getFieldType(), new SelectItems(new ArrayList<>()), null);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -27,7 +28,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -294,6 +294,7 @@ public class AlertCalledController extends BaseController {
     @PostMapping(value = "/billsend")
     @ApiOperation(httpMethod = "POST", value = "设备联动紧急响应", notes = "启动所有消防队伍的警铃、广播，并自动开启所有车库门")
     @Transactional
+    @RestEventTrigger(value = "opreateLogEventHandler")
     public ResponseModel<Boolean> controlEquip() throws Exception{
 
     	return ResponseHelper.buildResponse(iAlertCalledService.controlEquip());

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/event/OpreateLogEventHandler.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller.event;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.OperateLogModel;
+
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.event.RestEvent;
+import org.typroject.tyboot.component.event.RestEventHandler;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+/**
+ * 
+ * <pre>
+ * controller层操作日志事件监听
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: OpreateLogEventHandler.java, v 0.1 2021年8月19日 下午6:38:36 gwb Exp $
+ */
+@Component("opreateLogEventHandler")
+public class OpreateLogEventHandler extends RestEventHandler {
+
+    static ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    protected void handleEvent(RestEvent restEvent) throws Exception {
+
+        OperateLogModel operateLogModel =new OperateLogModel();
+        operateLogModel.setMethodLabel(restEvent.getMethodLabel());
+        operateLogModel.setMethodName(restEvent.getMethodName());
+        operateLogModel.setParams(objectMapper.writeValueAsString(restEvent.getParams()));
+        operateLogModel.setResult(objectMapper.writeValueAsString(restEvent.getSource()));
+        operateLogModel.setUserId(restEvent.getRequestContextModel().getExcutedUserId());
+        operateLogModel.setRemoteIp(restEvent.getRequestContextModel().getRequestIP());
+        operateLogModel.setToken(restEvent.getRequestContextModel().getToken());
+        operateLogModel.setTraceId(restEvent.getRequestContextModel().getTraceId());
+        operateLogModel.setAgencyCode(restEvent.getRequestContextModel().getAgencyCode());
+        operateLogModel.setAppCode(restEvent.getRequestContextModel().getAppKey());
+        
+        
+        RequestContext.setAppKey(restEvent.getRequestContextModel().getAppKey());
+        RequestContext.setProduct(restEvent.getRequestContextModel().getProduct());
+        RequestContext.setToken(restEvent.getRequestContextModel().getToken());
+        
+        Systemctl.operateLogClient.create(operateLogModel);
+    }
+}

amos-boot-module/amos-boot-module-biz/pom.xml

@@ -13,7 +13,21 @@
 	<packaging>pom</packaging>
 
 	<dependencies>
-
+		<dependency>
+			<groupId>org.typroject</groupId>
+			<artifactId>tyboot-component-event</artifactId>
+			<version>${tyboot-version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.typroject</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>io.springfox</groupId>
+					<artifactId>springfox-swagger2</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 
 	<modules>

amos-boot-system-maintenance/src/main/resources/db/changelog/mt-sql-task.xml

@@ -24,6 +24,12 @@
 			end if;
 			END
 		</createProcedure>
-
+	</changeSet>
+	<changeSet author="suhuiguang" id="1629352951339-1" runOnChange="true">
+		<sql>
+			DROP TRIGGER  IF EXISTS `addPointConfig`;
+			DROP TRIGGER  IF EXISTS `updatePointConfig`;
+			DROP TRIGGER  IF EXISTS `updatePointConfig`;
+		</sql>
 	</changeSet>
 </databaseChangeLog>
\ No newline at end of file