diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java new file mode 100644 index 000000000..7b5e997ef --- /dev/null +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java @@ -0,0 +1,36 @@ +package com.jero.common.constant.enums; + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum MessageTypeEnum { + READ("订阅通知","1"), + WARN("预警信息","2"), + PUSH("转发推送","3"); + + String name; + String value; + + private MessageTypeEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-module-system/pom.xml b/jero-boot/jero-boot-module-system/pom.xml index d1ba0c229..2b4a19c1f 100644 --- a/jero-boot/jero-boot-module-system/pom.xml +++ b/jero-boot/jero-boot-module-system/pom.xml @@ -57,6 +57,14 @@ 1.1.8 + + + + + + org.springframework.cloud + spring-cloud-openfeign-core + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/FeignClient/LocalToolFeignClient.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/FeignClient/LocalToolFeignClient.java new file mode 100644 index 000000000..c7414100e --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/FeignClient/LocalToolFeignClient.java @@ -0,0 +1,20 @@ +package com.jero.modules.FeignClient; + +import com.jero.modules.system.vo.OcrVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +/** + * @description + * @date 2021/12/8 14:53 + * @auth zhn + */ +@FeignClient(value = "local-tool") +public interface LocalToolFeignClient { + + @RequestMapping(value = "/local-tool/ocr/handleFile",method = RequestMethod.POST,headers = {"content-type=application/json"}) + ResponseEntity getFile(@RequestBody OcrVO ocrVO); +} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java index fe8cc372a..e6440be47 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java @@ -1,11 +1,11 @@ package com.jero.modules.system.controller; -import java.util.Arrays; -import java.util.Date; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.shiro.SecurityUtils; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; import com.jero.common.system.vo.LoginUser; @@ -13,6 +13,9 @@ import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysAnnouncementSend; import com.jero.modules.system.model.AnnouncementSendModel; import com.jero.modules.system.service.ISysAnnouncementSendService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -23,14 +26,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; /** * @Title: Controller @@ -39,13 +39,15 @@ import lombok.extern.slf4j.Slf4j; * @Date: 2019-02-21 * @Version: V1.0 */ + +@Api(tags="消息") @RestController @RequestMapping("/sys/sysAnnouncementSend") @Slf4j public class SysAnnouncementSendController { @Autowired private ISysAnnouncementSendService sysAnnouncementSendService; - + /** * 分页列表查询 * @param sysAnnouncementSend @@ -81,7 +83,7 @@ public class SysAnnouncementSendController { result.setResult(pageList); return result; } - + /** * 添加 * @param sysAnnouncementSend @@ -99,7 +101,7 @@ public class SysAnnouncementSendController { } return result; } - + /** * 编辑 * @param sysAnnouncementSend @@ -118,10 +120,10 @@ public class SysAnnouncementSendController { result.success("修改成功!"); } } - + return result; } - + /** * 通过id删除 * @param id @@ -139,10 +141,10 @@ public class SysAnnouncementSendController { result.success("删除成功!"); } } - + return result; } - + /** * 批量删除 * @param ids @@ -159,7 +161,7 @@ public class SysAnnouncementSendController { } return result; } - + /** * 通过id查询 * @param id @@ -177,7 +179,7 @@ public class SysAnnouncementSendController { } return result; } - + /** * @功能：更新用户系统消息阅读状态 * @param json @@ -198,7 +200,7 @@ public class SysAnnouncementSendController { result.setSuccess(true); return result; } - + /** * @功能：获取我的消息 * @return @@ -239,4 +241,35 @@ public class SysAnnouncementSendController { result.setMessage("全部已读"); return result; } + + /** + * @功能：标记已读 + * @return + */ + @GetMapping(value = "/read") + public Result read(String ids) { + Result result = new Result(); + List list = new ArrayList<>(); + for (String id : ids.split(",")) { + SysAnnouncementSend sysAnnouncementSend = new SysAnnouncementSend(); + sysAnnouncementSend.setId(id); + sysAnnouncementSend.setReadFlag("1"); + list.add(sysAnnouncementSend); + } + sysAnnouncementSendService.updateBatchById(list); + result.setSuccess(true); + result.setMessage("标记已读"); + return result; + } + /** + * @功能：查询所有的未读消息 + * @return + */ + @GetMapping(value = "/getMessageUnreadList") + public Result getMessageUnreadList() { + Result result = new Result(); + List messageUnreadList = sysAnnouncementSendService.getMessageUnreadList(); + result.OK(messageUnreadList); + return result; + } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java index 01642f1e0..779be4cd2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java @@ -38,6 +38,11 @@ public class SysAnnouncement implements Serializable { */ @Excel(name = "内容", width = 30) private java.lang.String msgContent; + + /** + * 详细内容 + */ + private java.lang.String msgContentInfo; /** * 开始时间 */ @@ -63,7 +68,7 @@ public class SysAnnouncement implements Serializable { @Excel(name = "优先级", width = 15, dicCode = "priority") @Dict(dicCode = "priority") private java.lang.String priority; - + /** * 消息类型1:通知公告2:系统消息 */ @@ -144,4 +149,8 @@ public class SysAnnouncement implements Serializable { * 摘要 */ private java.lang.String msgAbstract; + /** + * 文档id + */ + private java.lang.String documentId; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java index 1b85303bb..6e62a1240 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java @@ -76,8 +76,7 @@ public class SysCategory implements Serializable,Comparable{ private java.lang.String description; /**是否为标签内容-数据字典（1是 0否）*/ - @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15, dicText = "is_tag_dict", dicCode = "is_tag_dict") - @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict") + @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15) @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") private java.lang.Integer isTagDict; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java index 3cba02a4a..c30b861c7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java @@ -91,8 +91,7 @@ public class SysDict implements Serializable { /** * 是否为标签内容-数据字典（1是 0否） */ - @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15)/*, dicText = "is_tag_dict", dicCode = "is_tag_dict") - @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict")*/ + @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15) @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") private java.lang.Integer isTagDict; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysAnnouncementSendMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysAnnouncementSendMapper.java index bf116af71..7da638996 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysAnnouncementSendMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysAnnouncementSendMapper.java @@ -22,10 +22,12 @@ public interface SysAnnouncementSendMapper extends BaseMapper getMyAnnouncementSendList(Page page,@Param("announcementSendModel") AnnouncementSendModel announcementSendModel); + public List getMessageUnreadList(@Param("userId") String userId); + } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java index 1be8f49d9..4da1ed424 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java @@ -50,4 +50,11 @@ public interface SysDepartMapper extends BaseMapper { */ List getSubDepIdsByOrgCodes(@org.apache.ibatis.annotations.Param("orgCodes") String[] orgCodes); + /** + * 更新所有组织的父节点id + * @return + */ + @Select("UPDATE sys_depart t1 JOIN sys_depart t2 ON t1.parent_code = t2.org_code SET t1.parent_id = t2.id") + int updateAllParentId(); + } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java index 5ad607001..232297c31 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java @@ -1,21 +1,19 @@ package com.jero.modules.system.mapper; -import java.util.List; -import java.util.Map; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.ResultType; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.DictQuery; import com.jero.modules.system.entity.SysDict; import com.jero.modules.system.model.DuplicateCheckVo; import com.jero.modules.system.model.TreeSelectModel; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; /** *

@@ -49,6 +47,8 @@ public interface SysDictMapper extends BaseMapper { public String queryDictTextByKey(@Param("code") String code,@Param("key") String key); + public String queryDictKeyByText(@Param("code") String code,@Param("text") String key); + @Deprecated public String queryTableDictTextByKey(@Param("table") String table,@Param("text") String text,@Param("code") String code,@Param("key") String key); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 0032e1c00..3fcbe8ebb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -27,6 +27,12 @@ public interface SysUserMapper extends BaseMapper { * @return */ public SysUser getUserByName(@Param("username") String username); + /** + * 通过用户账号查询用户信息(批量) + * @param usernames + * @return + */ + public List getUserListByNames(@Param("usernames") String usernames); /** * 根据部门Id查询用户信息 @@ -58,22 +64,22 @@ public interface SysUserMapper extends BaseMapper { * @return */ IPage getUserByRoleId(Page page, @Param("roleId") String roleId, @Param("username") String username); - + /** * 根据用户名设置部门ID * @param username * @param departId */ void updateUserDepart(@Param("username") String username,@Param("orgCode") String orgCode); - + /** * 根据手机号查询用户信息 * @param phone * @return */ public SysUser getUserByPhone(@Param("phone") String phone); - - + + /** * 根据邮箱查询用户信息 * @param email @@ -132,7 +138,7 @@ public interface SysUserMapper extends BaseMapper { /** 更新空字符串为null【此写法有sql注入风险，禁止随便用】 */ int updateNullByEmptyString(@Param("fieldName") String fieldName); - + /** * 根据部门Ids,查询部门下用户信息 * @param departIds diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml index 7fd44a618..1efdc73a6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml @@ -6,6 +6,7 @@ + @@ -25,16 +26,17 @@ + - - + + - \ No newline at end of file + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml index de13e8b6b..13c9a18aa 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml @@ -1,13 +1,14 @@ - + + @@ -15,13 +16,14 @@ + - + - + + - \ No newline at end of file + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml index 80aa1ed45..e4e297331 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml @@ -16,6 +16,12 @@ and s.item_value = #{key} + + select * from sys_user where username = #{username} and del_flag = 0 + + - select d.depart_name,ud.user_id from sys_user_depart ud,sys_depart d where d.id = ud.dep_id and ud.user_id in + SELECT + d.depart_name, + dru.user_id + FROM + sys_depart_role_user dru, + sys_depart_role dr, + sys_depart d + WHERE + d.id = dr.depart_id + and dr.id = dru.drole_id + and dru.user_id in #{id} @@ -45,7 +64,7 @@ and username = #{username} - + UPDATE sys_user SET org_code = #{orgCode} where username = #{username} @@ -55,7 +74,7 @@ - + - \ No newline at end of file + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java index f6ba49567..6e252d172 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java @@ -20,7 +20,7 @@ import lombok.Data; @Data public class AnnouncementSendModel implements Serializable { private static final long serialVersionUID = 1L; - + /**id*/ @TableId(type = IdType.ASSIGN_ID) private java.lang.String id; @@ -32,6 +32,8 @@ public class AnnouncementSendModel implements Serializable { private java.lang.String titile; /**内容*/ private java.lang.String msgContent; + /**详细内容*/ + private java.lang.String msgContentInfo; /**发布人*/ private java.lang.String sender; /**优先级（L低，M中，H高）*/ @@ -76,5 +78,9 @@ public class AnnouncementSendModel implements Serializable { * 摘要 */ private java.lang.String msgAbstract; + /** + * 文档id + */ + private java.lang.String documentId; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java index 744130027..d80d113d5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface ISysAnnouncementSendService extends IService { public List queryByUserId(String userId); - + /** * @功能：获取我的消息 * @param announcementSendModel @@ -25,4 +25,6 @@ public interface ISysAnnouncementSendService extends IService getMyAnnouncementSendPage(Page page,AnnouncementSendModel announcementSendModel); + List getMessageUnreadList(); + } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java index 76931001e..a516ee25b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java @@ -130,4 +130,10 @@ public interface ISysDepartService extends IService{ * @return */ List queryByDepartCode(String departCode); + + /** + * 更新所有组织的父节点id + * @return + */ + int updateAllParentId(); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index 8ea12d3b8..4c727ae32 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -99,6 +99,8 @@ public class SyncDataServiceImpl implements ISyncDataService{ // int insertRowNum = insertDepartFromTree(ppo, 1); // log.info(ppo.getName() + "添加成功条数：" + insertRowNum); } + //添加组织的父节点id + sysDepartService.updateAllParentId(); } /** @@ -243,7 +245,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ sysUser.setThirdId(employee.getWorker_user_id()); sysUser.setActivitiSync(CommonConstant.ACT_SYNC_1); sysUser.setWorkNo(employee.getEmployee_id()); - sysUser.setUpdateTime(employee.getUpdate_time()); +// sysUser.setUpdateTime(employee.getUpdate_time()); sysUser.setCreateTime(new Date()); sysUser.setCreateBy("admin"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java index 52a65b6a4..c9f62b243 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java @@ -4,10 +4,12 @@ import java.util.List; import javax.annotation.Resource; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.system.entity.SysAnnouncementSend; import com.jero.modules.system.mapper.SysAnnouncementSendMapper; import com.jero.modules.system.model.AnnouncementSendModel; import com.jero.modules.system.service.ISysAnnouncementSendService; +import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -24,7 +26,7 @@ public class SysAnnouncementSendServiceImpl extends ServiceImpl queryByUserId(String userId) { return sysAnnouncementSendMapper.queryByUserId(userId); @@ -36,4 +38,10 @@ public class SysAnnouncementSendServiceImpl extends ServiceImpl getMessageUnreadList() { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + return sysAnnouncementSendMapper.getMessageUnreadList(sysUser.getId()); + } + } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementServiceImpl.java index 65e36eb80..b296f7b6f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementServiceImpl.java @@ -32,10 +32,10 @@ public class SysAnnouncementServiceImpl extends ServiceImpl stringList) { + if (CollectionUtils.isEmpty(stringList)) { + return null; + } else { + StringBuilder builder = new StringBuilder(); + + for(int i = 0; i < stringList.size(); ++i) { + builder.append((String)stringList.get(i)); + if (i < stringList.size() - 1) { + builder.append(","); + } + } + + return builder.toString(); + } + } + + public static List stringToList(String string) { + return isEmpty(string) ? null : Arrays.asList(string.split(",")); + } + + public static List stringToIntList(String string) { + if (isEmpty(string)) { + return null; + } else { + List integerList = new ArrayList(); + String[] stringArray = string.split(","); + + for(int i = 0; i < stringArray.length; ++i) { + String str = stringArray[i]; + if (isNotEmpty(str)) { + integerList.add(Integer.valueOf(str)); + } + } + + return integerList; + } + } + + public static String FilterNull(Object o) { + return o != null && !"null".equals(o.toString()) ? o.toString().trim() : ""; + } + + public static boolean isEmptyWithFilterNull(Object o) { + if (o == null) { + return true; + } else { + return "".equals(FilterNull(o.toString())); + } + } +} + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtils.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtils.java new file mode 100644 index 000000000..73752f906 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtils.java @@ -0,0 +1,28 @@ +package com.jero.modules.system.util; + +import com.jero.common.system.vo.LoginUser; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.UnavailableSecurityManagerException; +import org.apache.shiro.session.InvalidSessionException; + +public class UserUtils { + + /** + * 获取当前登录用户ID + * + */ + public static String getUserId() { + String userId = null; + try { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(sysUser!=null){ + userId = sysUser.getId(); + } + } catch (UnavailableSecurityManagerException e) { + e.printStackTrace(); + } catch (InvalidSessionException e) { + e.printStackTrace(); + } + return userId; + } +} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/OcrVO.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/OcrVO.java new file mode 100644 index 000000000..0d24949c9 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/OcrVO.java @@ -0,0 +1,85 @@ +package com.jero.modules.system.vo; + + +import java.io.Serializable; + +/** + * 功能：OCR_RECORD OcrRecordEOEntity
+ * 作者：code generator
+ * 日期： 2019-03-25
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class OcrVO implements Serializable{ + private String restHandleFileUrl; + private String OcrUserId; + private String authCode; + private String convertType; + private String fileName; + private String fileContent; + private String taskId; + private String RestCallBackUrl; + + public String getRestHandleFileUrl() { + return restHandleFileUrl; + } + + public void setRestHandleFileUrl(String restHandleFileUrl) { + this.restHandleFileUrl = restHandleFileUrl; + } + + public String getOcrUserId() { + return OcrUserId; + } + + public void setOcrUserId(String ocrUserId) { + OcrUserId = ocrUserId; + } + + public String getAuthCode() { + return authCode; + } + + public void setAuthCode(String authCode) { + this.authCode = authCode; + } + + public String getConvertType() { + return convertType; + } + + public void setConvertType(String convertType) { + this.convertType = convertType; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileContent() { + return fileContent; + } + + public void setFileContent(String fileContent) { + this.fileContent = fileContent; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getRestCallBackUrl() { + return RestCallBackUrl; + } + + public void setRestCallBackUrl(String restCallBackUrl) { + RestCallBackUrl = restCallBackUrl; + } +} diff --git a/jero-boot/jero-boot-modules/pom.xml b/jero-boot/jero-boot-modules/pom.xml index 531616feb..e8c7f0a7b 100644 --- a/jero-boot/jero-boot-modules/pom.xml +++ b/jero-boot/jero-boot-modules/pom.xml @@ -107,6 +107,30 @@ org.springframework.cloud spring-cloud-starter-openfeign + + + + org.apache.ant + ant + 1.10.5 + + + + + cn.afterturn + easypoi-base + 3.2.0 + + + cn.afterturn + easypoi-web + 3.2.0 + + + cn.afterturn + easypoi-annotation + 3.2.0 + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 14d525feb..e94a3432e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; @@ -25,7 +27,14 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; +import com.jero.modules.system.entity.SysAnnouncement; +import com.jero.modules.system.entity.SysAnnouncementSend; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.ISysAnnouncementSendService; +import com.jero.modules.system.service.ISysAnnouncementService; +import com.jero.modules.system.service.impl.SysBaseApiImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.service.impl.OnlCgformAreaServiceImpl; @@ -96,6 +105,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldFileList, List fieldPullList, String cut) { + StringBuilder sb = getUpdateInfo(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList, cut); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (StringUtils.isNotBlank(sb)) { + String content = sb.substring(0, sb.length() - 1); + BussLogEO bussLogEO = new BussLogEO(); + bussLogEO.setDocumentId((String) map.get("id")); + bussLogEO.setContent(content); + bussLogEO.setCreateBy(sysUser.getRealname()); + iBussLogEOService.add(bussLogEO); + } + } + + @NotNull + private StringBuilder getUpdateInfo(Map map, List> dataList, List fieldList, List fieldDateList, List fieldFileList, List fieldPullList, String cut) { Map mapTemp = new HashMap<>(); mapCopy(map, mapTemp); //时间类型的字段 @@ -860,15 +887,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map, List> dataList) { + private void sendMessage(Map map, + List> dataList, + List fieldList, + List fieldDateList, + List fieldFileList, + List fieldPullList, + String cut) { + //修改的内容 + StringBuilder sb = getUpdateInfo(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList, cut); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String serialNumber = (String) dataList.get(0).get("serial_number"); + //只要修改了标准,就需要向订阅用户发送消息(内容为-->XXX对“GB 7258 进行了修改请及时查看”) + //1.先判断是否订阅 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId, (String)map.get("id")); + List onlCgformSubscribeList = iOnlCgformSubscribeService.list(lambdaQueryWrapper); + List userNameList = new ArrayList<>(); + if(onlCgformSubscribeList.size() != 0){ + for (OnlCgformSubscribe onlCgformSubscribe : onlCgformSubscribeList) { + userNameList.add(onlCgformSubscribe.getCreateBy()); + } + List userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ",")); + List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); + + SysAnnouncement sysAnnouncement = new SysAnnouncement(); + sysAnnouncement.setDelFlag("0"); + sysAnnouncement.setSendStatus("0"); + sysAnnouncement.setSendTime(new Date()); + sysAnnouncement.setDocumentId((String) dataList.get(0).get("id")); + sysAnnouncement.setMsgCategory(MessageTypeEnum.READ.getValue());//消息类型 + sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 + sysAnnouncement.setMsgContent(sysUser.getRealname()+"对"+serialNumber+"进行了修改请及时查看"); + sysAnnouncement.setMsgContentInfo(sysUser.getRealname()+"修改标准"+serialNumber+"中"+sb.toString()); + sysAnnouncement.setUserIds(StringUtils.join(userIdList,",")); +//111111111111111111111111111111111 + sysAnnouncementService.saveAnnouncement(sysAnnouncement); + } //处理修改代替标准,发送通知 //修改时前端传参 String replaceStandard = (String) map.get("replace_standard"); @@ -1186,13 +1241,16 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(OnlCgformCollection::getDocumentId, idList); + wrapper.eq(OnlCgformCollection::getCreateBy,sysUser.getUsername()); List collectList = iOnlCgformCollectionService.list(wrapper); List collectIdList = collectList.stream().map(OnlCgformCollection::getDocumentId).collect(Collectors.toList()); //订阅 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId, idList); + lambdaQueryWrapper.eq(OnlCgformSubscribe::getCreateBy,sysUser.getUsername()); List subscribeList = iOnlCgformSubscribeService.list(lambdaQueryWrapper); List subscribeIdList = subscribeList.stream().map(OnlCgformSubscribe::getDocumentId).collect(Collectors.toList()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java index 9470b6d26..b6f297e14 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java @@ -2,17 +2,17 @@ package com.jero.modules.ocr.service.impl; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; -import com.jero.common.system.vo.LoginUser; +import com.jero.modules.FeignClient.LocalToolFeignClient; import com.jero.modules.ocr.entity.OcrRecordEO; import com.jero.modules.ocr.entity.OcrResultEO; import com.jero.modules.ocr.service.IOcrRecordEOService; import com.jero.modules.ocr.service.IOcrRestfulService; import com.jero.modules.ocr.util.Base64Util; import com.jero.modules.ocr.util.RsaUtil; +import com.jero.modules.system.vo.OcrVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; @@ -46,6 +46,8 @@ public class OcrRestfulServiceImpl implements IOcrRestfulService { @Autowired private RestTemplate restTemplate; + @Autowired + private LocalToolFeignClient localToolFeignClient; @Autowired private IOcrRecordEOService ocrRecordEOService; @@ -113,7 +115,18 @@ public class OcrRestfulServiceImpl implements IOcrRestfulService { SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); log.info("处理完文件数据，开始请求OCR接口数据：【"+sdf.format(new Date())+"】"); try{ - ResponseEntity responseEntity = restTemplate.postForEntity(RestHandleFileUrl, httpEntity, String.class); +// ResponseEntity responseEntity = restTemplate.postForEntity(RestHandleFileUrl, httpEntity, String.class); + OcrVO ocrVO = new OcrVO(); + ocrVO.setRestHandleFileUrl(RestHandleFileUrl); + ocrVO.setOcrUserId(OcrUserId); + ocrVO.setAuthCode(authCode); + ocrVO.setConvertType(convertType); + ocrVO.setFileName(fileName); + ocrVO.setFileContent(fileContent); + ocrVO.setTaskId(taskId); + ocrVO.setRestCallBackUrl(RestCallBackUrl); + ResponseEntity responseEntity = localToolFeignClient.getFile(ocrVO); + log.info("请求OCR接口完毕，返回响应状态：【"+sdf.format(new Date())+"】"); HttpStatus statusCode = responseEntity.getStatusCode(); if(statusCode != HttpStatus.OK){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/BasePage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/BasePage.java new file mode 100644 index 000000000..65b91329d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/BasePage.java @@ -0,0 +1,91 @@ +package com.jero.modules.split.common; + +public class BasePage{ + private Integer page = 1; + private Integer pageSize = 10; + private Integer startIndex; + private Integer endIndex; + private String orderBy; + private String order; + private String q; + private Pager pager = new Pager(); + + public BasePage() { + } + + public Pager getPager() { + this.pager.setPageId(this.getPage()); + this.pager.setPageSize(this.getPageSize()); + String orderField = ""; + if (this.orderBy != null && this.orderBy.trim().length() > 0) { + orderField = this.orderBy; + } + + if (orderField.trim().length() > 0 && this.order != null && this.order.trim().length() > 0) { + orderField = orderField + " " + this.order; + } + + this.pager.setOrderField(orderField); + return this.pager; + } + + public void setPager(Pager pager) { + this.pager = pager; + } + + public Integer getPage() { + return this.page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getPageSize() { + return this.pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public String getOrderBy() { + return this.orderBy; + } + + public void setOrderBy(String orderBy) { + this.orderBy = orderBy; + } + + public String getOrder() { + return this.order; + } + + public void setOrder(String order) { + this.order = order; + } + + public String getQ() { + return this.q; + } + + public void setQ(String q) { + this.q = q; + } + + public Integer getStartIndex() { + return this.startIndex; + } + + public void setStartIndex(Integer startIndex) { + this.startIndex = (this.page - 1) * this.pageSize + 1; + } + + public Integer getEndIndex() { + return this.endIndex; + } + + public void setEndIndex(Integer endIndex) { + this.endIndex = this.page * this.pageSize; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/ConvertHtml2Excel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/ConvertHtml2Excel.java new file mode 100644 index 000000000..a7c227cf7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/ConvertHtml2Excel.java @@ -0,0 +1,284 @@ +package com.jero.modules.split.common; + +import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.hssf.util.HSSFCellUtil; +import org.apache.poi.hssf.util.HSSFColor; +import org.apache.poi.ss.util.CellRangeAddress; +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/2/26 10:10 + */ +public class ConvertHtml2Excel { + + /** + * html表格转excel + */ + public static HSSFWorkbook table2Excel(String tableHtml,HSSFWorkbook wb,String sheetName) throws Exception { +// HSSFWorkbook wb = new HSSFWorkbook(); + HSSFSheet sheet = wb.createSheet(sheetName); + List moneyCols =new ArrayList<>(); + moneyCols.add(1); + int headEndRow = 1; + List crossRowEleMetaLs = new ArrayList(); + int rowIndex = 0; + try { + Document data = DocumentHelper.parseText(tableHtml); + HSSFCellStyle contentStyle = getContentStyle(wb); + // 生成表头 + Element thead = data.getRootElement().element("thead"); + HSSFCellStyle titleStyle = getTitleStyle(wb); + int ls = 0;//列数 + if (thead != null) { + List trLs = thead.elements("tr"); + for (Element trEle : trLs) { + HSSFCellStyle style = rowIndex<=headEndRow?titleStyle:contentStyle; + style.setWrapText(true); + HSSFRow row = sheet.createRow(rowIndex); + List thLs = trEle.elements("th"); + if(ls tdLs = trEle.elements("td"); + if(ls trBody = tbody.elements("tr"); + for (Element trEle : trBody) { + HSSFCellStyle style = rowIndex<=headEndRow?titleStyle:contentStyle; + style.setWrapText(true); + HSSFRow row = sheet.createRow(rowIndex); + List thLs = trEle.elements("th"); + if(ls tdLs = trEle.elements("td"); + if(ls trFoot = tfoot.elements("tr"); + for (Element trEle : trFoot) { + HSSFCellStyle style = rowIndex<=headEndRow?titleStyle:contentStyle; + style.setWrapText(true); + HSSFRow row = sheet.createRow(rowIndex); + List thLs = trEle.elements("th"); + if(ls tdLs = trEle.elements("td"); + if(ls tdLs, int rowIndex, HSSFRow row, int startCellIndex, HSSFCellStyle cellStyle, + List crossRowEleMetaLs, boolean inHead, List moneyCols) { + int i = startCellIndex; + for (int eleIndex = 0; eleIndex < tdLs.size(); i++, eleIndex++) { + int captureCellSize = getCaptureCellSize(rowIndex, i, crossRowEleMetaLs); + while (captureCellSize > 0) { + for (int j = 0; j < captureCellSize; j++) {// 当前行跨列处理（补单元格） + row.createCell(i); + i++; + } + captureCellSize = getCaptureCellSize(rowIndex, i, crossRowEleMetaLs); + } + Element thEle = tdLs.get(eleIndex); + String val = thEle.getText(); + if (StringUtils.isEmpty(val)) { + Element e = thEle.element("a"); + if (e != null) { + val = e.getText(); + } + } + HSSFCell c = row.createCell(i); + if (NumberUtils.isNumber(val)) { + if (moneyCols != null && moneyCols.contains(i)) { + c.setCellType(HSSFCell.CELL_TYPE_STRING); + c.setCellValue(val); + } else { + c.setCellValue(Double.parseDouble(val)); + c.setCellType(HSSFCell.CELL_TYPE_NUMERIC); + } + + } else { + c.setCellType(HSSFCell.CELL_TYPE_STRING); + c.setCellValue(new HSSFRichTextString(val)); + } + int rowSpan = NumberUtils.toInt(thEle.attributeValue("rowspan"), 1); + int colSpan = NumberUtils.toInt(thEle.attributeValue("colspan"), 1); + c.setCellStyle(cellStyle); + if (rowSpan > 1 || colSpan > 1) { // 存在跨行或跨列 + crossRowEleMetaLs.add(new CrossRangeCellMeta(rowIndex, i, rowSpan, colSpan, inHead)); + } + if (colSpan > 1) {// 当前行跨列处理（补单元格） + for (int j = 1; j < colSpan; j++) { + i++; + row.createCell(i); + } + } + } + return i; + } + + /** + * 设置合并单元格的边框样式 + * + * @param sheet + * @param region + * @param cs + */ + public static void setRegionStyle(HSSFSheet sheet, CellRangeAddress region, HSSFCellStyle cs) { + for (int i = region.getFirstRow(); i <= region.getLastRow(); i++) { + HSSFRow row = HSSFCellUtil.getRow(i, sheet); + for (int j = region.getFirstColumn(); j <= region.getLastColumn(); j++) { + HSSFCell cell = HSSFCellUtil.getCell(row, (short) j); + cell.setCellStyle(cs); + } + } + } + + /** + * 获得因rowSpan占据的单元格 + * + * @param rowIndex 行号 + * @param colIndex 列号 + * @param crossRowEleMetaLs 跨行列元数据 + * @return 当前行在某列需要占据单元格 + */ + private static int getCaptureCellSize(int rowIndex, int colIndex, List crossRowEleMetaLs) { + int captureCellSize = 0; + for (CrossRangeCellMeta crossRangeCellMeta : crossRowEleMetaLs) { + if (crossRangeCellMeta.getFirstRow() < rowIndex && crossRangeCellMeta.getLastRow() >= rowIndex) { + if (crossRangeCellMeta.getFirstCol() <= colIndex && crossRangeCellMeta.getLastCol() >= colIndex) { + captureCellSize = crossRangeCellMeta.getLastCol() - colIndex + 1; + } + } + } + return captureCellSize; + } + + /** + * 获得标题样式 + * + * @param workbook + * @return + */ + private static HSSFCellStyle getTitleStyle(HSSFWorkbook workbook) { + short titlebackgroundcolor = HSSFColor.WHITE.index; + short fontSize = 11; + String fontName = "宋体"; + HSSFCellStyle style = workbook.createCellStyle(); + style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); + style.setAlignment(HSSFCellStyle.ALIGN_CENTER); + style.setBorderBottom(HSSFCellStyle.BORDER_THIN); //下边框 + style.setBorderLeft(HSSFCellStyle.BORDER_THIN);//左边框 + style.setBorderTop(HSSFCellStyle.BORDER_THIN);//上边框 + style.setBorderRight(HSSFCellStyle.BORDER_THIN);//右边框 + style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND); + style.setFillForegroundColor(titlebackgroundcolor);// 背景色 + style.setWrapText(true); + HSSFFont font = workbook.createFont(); +// font.setFontName(fontName); + font.setFontHeightInPoints(fontSize); +// font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); + style.setFont(font); + return style; + } + + /** + * 获得内容样式 + * + * @param wb + * @return + */ + private static HSSFCellStyle getContentStyle(HSSFWorkbook wb) { + short fontSize = 11; +// String fontName = "宋体"; + HSSFCellStyle style = wb.createCellStyle(); + style.setBorderBottom((short) 1); + style.setBorderTop((short) 1); + style.setBorderLeft((short) 1); + style.setBorderRight((short) 1); + HSSFFont font = wb.createFont(); +// font.setFontName(fontName); + font.setFontHeightInPoints(fontSize); + style.setFont(font); + style.setAlignment(HSSFCellStyle.ALIGN_CENTER);//水平居中 + style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);//垂直居中 + style.setWrapText(true); + return style; + } + + public static void main(String[] args) throws Exception { + String cnt = "\n"; + List c =new ArrayList<>(); + c.add(1); + String tableHtml = "
111111113333333333444444444
555555566666
324234
"; + tableHtml = tableHtml.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt); +// HSSFWorkbook hssfWorkbook = ConvertHtml2Excel.table2Excel(tableHtml,c,1); +// hssfWorkbook.write(FileUtils.openOutputStream(new File("D:\\test\\test1.xls"))); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/CrossRangeCellMeta.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/CrossRangeCellMeta.java new file mode 100644 index 000000000..52f8b2f9e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/CrossRangeCellMeta.java @@ -0,0 +1,53 @@ +package com.jero.modules.split.common; + +/** + * @Description: table转excel 跨行元素元数据 + * @Author: yangxuenan + * date: 2020/2/26 10:14 + */ +public class CrossRangeCellMeta { + + public CrossRangeCellMeta(int firstRowIndex, int firstColIndex, int rowSpan, int colSpan, boolean inHead) { + super(); + this.firstRowIndex = firstRowIndex; + this.firstColIndex = firstColIndex; + this.rowSpan = rowSpan; + this.colSpan = colSpan; + this.inHead = inHead; + } + + private int firstRowIndex; + private int firstColIndex; + private int rowSpan;// 跨越行数 + private int colSpan;// 跨越列数 + private boolean inHead; + + public boolean isInHead() { + return inHead; + } + + public CrossRangeCellMeta setInHead(boolean inHead) { + this.inHead = inHead; + return this; + } + + public int getFirstRow() { + return firstRowIndex; + } + + public int getLastRow() { + return firstRowIndex + rowSpan - 1; + } + + public int getFirstCol() { + return firstColIndex; + } + + public int getLastCol() { + return firstColIndex + colSpan - 1; + } + + public int getColSpan() { + return colSpan; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java new file mode 100644 index 000000000..a5c3af002 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java @@ -0,0 +1,155 @@ +package com.jero.modules.split.common; + +import com.xkcoding.http.util.StringUtil; +import org.apache.tools.zip.ZipEntry; +import org.apache.tools.zip.ZipFile; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; + +public class FileUnZip { + + private static final Logger logger = LoggerFactory.getLogger(FileUnZip.class); + + /** + * 解压zip文件 + * + * @param sourceFile,待解压的zip文件; toFolder,解压后的存放路径 + * @throws Exception + * @author gaoyan + **/ + public static String unZipFiles(String sourceFile, String descDir) throws IOException { + File zipFile = new File(sourceFile); + + File pathFile = new File(descDir); + if (!pathFile.exists()) { + pathFile.mkdirs(); + } + ZipFile zip = new ZipFile(zipFile,"gbk"); + String orgMkdirs = ""; + for (Enumeration entries = zip.getEntries(); entries.hasMoreElements(); ) { + ZipEntry entry = (ZipEntry) entries.nextElement(); + String zipEntryName = entry.getName(); + String outPath = (descDir + "/" + zipEntryName).replaceAll("\\*", "/"); + //判断路径是否存在,不存在则创建文件路径 + File file = new File(outPath.substring(0, outPath.lastIndexOf('/'))); + if (!file.exists()) { + orgMkdirs = outPath.substring(0, outPath.lastIndexOf('/')); + file.mkdirs(); + }else{ + orgMkdirs = outPath.substring(0, outPath.lastIndexOf('/')); + } + //判断文件全路径是否为文件夹,如果是上面已经上传,不需要解压 + if (new File(outPath).isDirectory()) { + continue; + } + //输出文件路径信息 +// InputStream in = null; +// OutputStream out = null; + try(InputStream in =zip.getInputStream(entry); + OutputStream out =new FileOutputStream(outPath)){ + byte[] buf1 = new byte[1024]; + int len; + while ((len = in.read(buf1)) > 0) { + out.write(buf1, 0, len); + } + }catch(IOException e){ + logger.error(e.getMessage(),e); + } + } + zip.close(); + return orgMkdirs; + } + + /** + * 递归删除文件及文件夹 + * + * @throws Exception + * @author gaoyan + * toFolder,解压后的存放路径 + **/ + public static boolean deleteDir(File dir) { + if (dir.isDirectory()) { + String[] children = dir.list(); + for (int i = 0; i < children.length; i++) { + boolean success = deleteDir(new File(dir, children[i])); + if (!success) { + return false; + } + } + } + // 目录此时为空，可以删除 + return dir.delete(); + } + + /** + * 读取一个目录下所有的Excel文件 + * gaoyan + * + * @param path + */ + public static List readExcelFile(String path) { + File file = new File(path); + List resultlist = new ArrayList<>(); + if (file.isDirectory()) { + File[] files = file.listFiles(); + for (File fi : files) { + // 对文件进行过滤，只读取Excel文件 + if (fi.getName().contains(".xls") || fi.getName().contains(".xlsx")) { + resultlist.add(fi); + } + } + } + return resultlist; + } + + /** + * 根据文件名称读取固定目录下文件 + * gaoyan + * @param filename + */ + public static List readFileByFilename(String path,String filename) { + List resultlist = new ArrayList<>(); + if (StringUtil.isNotEmpty(path)){ + File file = new File(path); + if (file.isDirectory()) { + File[] files = file.listFiles(); + for (File fi : files) { + // 对文件进行过滤 + if (fi.getName().equals(filename)) { + resultlist.add(fi); + } + } + } + } + return resultlist; + } + + /** + *@Description: 删除某个文件 + *@Param: [file] + *@return: void + *@Author: duyunbao + *@date: 2019/5/23 20:31 + */ + public static void delete(File file) { + if (!file.exists()) return; + + if (file.isFile() || file.list() == null) { + file.delete(); + logger.info("删除了" + file.getName()); + } else { + File[] files = file.listFiles(); + for (File a : files) { + delete(a); + } + file.delete(); + logger.info("删除了" + file.getName()); + } + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/Pager.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/Pager.java new file mode 100644 index 000000000..bc8f05ad1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/Pager.java @@ -0,0 +1,171 @@ +package com.jero.modules.split.common; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 11:14 2022/3/2 + */ +public class Pager { + private int pageId = 1; + private int rowCount = 0; + private int pageSize = 10; + private int pageCount = 0; + private int pageOffset = 0; + private int pageTail = 0; + private String orderField; + private boolean orderDirection = true; + private boolean pageEnabled = true; + private int length = 6; + private int startIndex = 0; + private int endIndex = 0; + private int[] indexs; + + public Pager() { + } + + public int getLength() { + return this.length; + } + + public void setLength(int length) { + this.length = length; + } + + public int[] getIndexs() { + int len = this.getEndIndex() - this.getStartIndex() + 1; + this.indexs = new int[len]; + + for(int i = 0; i < len; ++i) { + this.indexs[i] = this.getStartIndex() + i; + } + + return this.indexs; + } + + public void setIndexs(int[] indexs) { + this.indexs = indexs; + } + + public int getStartIndex() { + this.startIndex = (this.pageId - 1) * this.pageSize + 1; + return this.startIndex; + } + + public void setStartIndex(int startIndex) { + System.out.println("startIndx:" + this.pageId + ":" + this.pageSize); + this.startIndex = (this.pageId - 1) * this.pageSize + 1; + } + + public int getEndIndex() { + this.endIndex = this.pageId * this.pageSize; + return this.endIndex; + } + + public void setEndIndex(int endIndex) { + this.endIndex = this.pageId * this.pageSize; + } + + protected void doPage() { + this.pageCount = this.rowCount / this.pageSize + 1; + if (this.rowCount % this.pageSize == 0 && this.pageCount > 1) { + --this.pageCount; + } + + this.pageOffset = (this.pageId - 1) * this.pageSize; + this.pageTail = this.pageOffset + this.pageSize; + if (this.pageOffset + this.pageSize > this.rowCount) { + this.pageTail = this.rowCount; + } + + } + + public String getOrderCondition() { + String condition = ""; + if (this.orderField != null && this.orderField.length() != 0) { + condition = " order by " + this.orderField + (this.orderDirection ? " " : " desc "); + } + + return condition; + } + + public String getMysqlQueryCondition() { + String condition = ""; + if (this.pageEnabled) { + } + + return condition; + } + + public void setOrderDirection(boolean orderDirection) { + this.orderDirection = orderDirection; + } + + public boolean isOrderDirection() { + return this.orderDirection; + } + + public void setOrderField(String orderField) { + this.orderField = orderField; + } + + public String getOrderField() { + return this.orderField; + } + + public void setPageCount(int pageCount) { + this.pageCount = pageCount; + } + + public int getPageCount() { + return this.pageCount; + } + + public void setPageId(int pageId) { + this.pageId = pageId; + } + + public int getPageId() { + return this.pageId; + } + + public void setPageOffset(int pageOffset) { + this.pageOffset = pageOffset; + } + + public int getPageOffset() { + return this.pageOffset; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getPageSize() { + return this.pageSize; + } + + public void setPageTail(int pageTail) { + this.pageTail = pageTail; + } + + public int getPageTail() { + return this.pageTail; + } + + public void setRowCount(int rowCount) { + this.rowCount = rowCount; + this.doPage(); + } + + public int getRowCount() { + return this.rowCount; + } + + public boolean isPageEnabled() { + return this.pageEnabled; + } + + public void setPageEnabled(boolean pageEnabled) { + this.pageEnabled = pageEnabled; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/ReadExcel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/ReadExcel.java new file mode 100644 index 000000000..bd236289a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/ReadExcel.java @@ -0,0 +1,176 @@ +package com.jero.modules.split.common; + +import com.jero.modules.split.util.WDWUtil; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.commons.CommonsMultipartFile; + +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.io.InputStream; +import java.net.URLEncoder; + +/** + * @des : excel信息读取 + * @author: duyunbao + * @email: 1114808306@qq.com + * @date 2017/10/27 17:06 + **/ +public class ReadExcel { + private static final Logger logger = LoggerFactory.getLogger(ReadExcel.class); + + /** + * 总行数 + */ + private int totalRows = 0; + /** + * 总条数 + */ + private int totalCells = 0; + /** + * 错误信息接收器 + */ + private String errorMsg; + + public ReadExcel() { + // 不做操作 + } + + public int getTotalRows() { + return totalRows; + } + + public int getTotalCells() { + return totalCells; + } + + public String getErrorInfo() {//获取错误信息 + return errorMsg; + } + + /** + * @method_name: validateExcel + * @des : 验证excel格式 + * @author: duyunbao + * @param: [filePath] + * @return: boolean + * @date: 2017/10/27 17:07 + **/ + public boolean validateExcel(String filePath) { + if (filePath == null || !(WDWUtil.isExcel2003(filePath) || WDWUtil.isExcel2007(filePath))) { + errorMsg = "文件名不是excel格式"; + return false; + } + return true; + } + + /** + * @method_name: getExcelInfo + * @des : 读EXCEL文件，获取信息集合 + * @author: duyunbao + * @param: [fileName, Mfile] + * @return: org.apache.poi.ss.usermodel.Workbook + * @date: 2017/10/27 17:08 + **/ + public Workbook getExcelInfo(String fileName, MultipartFile Mfile) { + Workbook wb = null; + //把spring文件上传的MultipartFile转换成CommonsMultipartFile类型 + CommonsMultipartFile cf = (CommonsMultipartFile) Mfile; //获取本地存储路径 + //初始化输入流 + InputStream is = null; + try { + //根据文件名判断文件是2003版本还是2007版本 + boolean isExcel2003 = true; + if (WDWUtil.isExcel2007(fileName)) { + isExcel2003 = false; + } + is = cf.getInputStream(); + //根据excel里面的内容读取客户信息 + wb = getExcelInfo(is, isExcel2003, wb); + is.close(); + } catch (Exception e) { + logger.error(e.getMessage(),e); + } finally { + if (is != null) { + try { + is.close(); + } catch (IOException e) { + is = null; + logger.error(e.getMessage(),e); + } + } + } + return wb; + } + + /*** + * @method_name: getExcelInfo + * @des : 判断excel版本 + * @author: duyunbao + * @param: [is, isExcel2003, wb] + * @return: org.apache.poi.ss.usermodel.Workbook + * @date: 2017/10/27 17:08 + **/ + private Workbook getExcelInfo(InputStream is, boolean isExcel2003, Workbook wb) { + Workbook workbook =wb; + try { + /** 根据版本选择创建Workbook的方式 */ + //当excel是2003时 + if (isExcel2003) { + workbook = new HSSFWorkbook(is); + } else {//当excel是2007时 + workbook = new XSSFWorkbook(is); + } + } catch (IOException e) { + logger.error(e.getMessage(),e); + } + return workbook; + } + + /** + * 获取sheet的名称 + * @MethodName:getSheetName + * @author: 马晓晨 + * @email: 747052172@qq.com + * @date 2017年11月24日 上午9:49:22 + * @version V1.0 + * @param filename + * @param file + * @param sheetIndex + * @return + */ + public String getSheetName(String filename, MultipartFile file, Integer sheetIndex) { + Workbook wb = getExcelInfo(filename, file); + return wb.getSheetName(sheetIndex); + } + + /** + * + * @Title: encodeFileName + * @Description: 导出文件转换文件名称编码 + * @param @param fileNames + * @param @param request + * @param @return 设定文件 + * @return String 返回类型 + * @throws + */ + public static String encodeFileName(String fileNames ,HttpServletRequest request) { + try { + String agent = request.getHeader("User-Agent"); + if (agent.contains("Firefox")) { + fileNames = new String(fileNames.getBytes("UTF-8"), "ISO8859-1"); // firefox浏览器 + } else { + fileNames = URLEncoder.encode(fileNames, "utf-8"); + //谷歌中空格变为+问题 + fileNames = fileNames.replaceAll("\\+","%20"); + } + } catch (Exception e) { + logger.error(e.getMessage(),e); + } + return fileNames ; + } +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/SplitTableInfo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/SplitTableInfo.java new file mode 100644 index 000000000..6aaeb5b7d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/SplitTableInfo.java @@ -0,0 +1,28 @@ +package com.jero.modules.split.common; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/5/11 10:29 + */ +public class SplitTableInfo { + private String tableName; + + private String tableHtml; + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public String getTableHtml() { + return tableHtml; + } + + public void setTableHtml(String tableHtml) { + this.tableHtml = tableHtml; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/UploadFileInfo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/UploadFileInfo.java new file mode 100644 index 000000000..78d902826 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/UploadFileInfo.java @@ -0,0 +1,36 @@ +package com.jero.modules.split.common; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/1/9 18:59 + */ +public class UploadFileInfo { + private String id; + private String filePath; + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java new file mode 100644 index 000000000..4eab9deaf --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java @@ -0,0 +1,703 @@ +package com.jero.modules.split.controller; + +import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.ImportParams; +import cn.hutool.core.util.ZipUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.split.common.ConvertHtml2Excel; +import com.jero.modules.split.common.FileUnZip; +import com.jero.modules.split.common.ReadExcel; +import com.jero.modules.split.common.SplitTableInfo; +import com.jero.modules.split.dto.*; +import com.jero.modules.split.entity.SarFileSplitItemsEO; +import com.jero.modules.split.entity.SarFileSplitItemsParamsEO; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.page.SarFileSplitItemsEOPage; +import com.jero.modules.split.page.SarFileSplitItemsParamsEOPage; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsEOService; +import com.jero.modules.split.service.ISarFileSplitItemsParamsEOService; +import com.jero.modules.split.service.ISarFileSplitItemsTableEOService; +import com.jero.modules.split.service.ISarFileSplitItemsValEOService; +import com.jero.modules.split.util.POIReadExcelToHtml; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.poi.common.usermodel.HyperlinkType; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.hssf.util.HSSFColor; +import org.apache.poi.ss.usermodel.CreationHelper; +import org.apache.poi.ss.usermodel.Hyperlink; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.util.IOUtils; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.OutputStream; +import java.util.*; + +import static com.jero.modules.split.util.ExcelUtil.checkObjAllFieldsIsNull; + +@RestController +@RequestMapping("/split/sarFileSplitItems") +@Api(tags = "文档拆分条款信息") +public class SarFileSplitItemsEOController extends JeroController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsEOController.class); + + @Autowired + private ISarFileSplitItemsEOService sarFileSplitItemsEOService; + + @Autowired + private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService; + + @Autowired + private ISarFileSplitItemsTableEOService sarFileSplitItemsTableEOService; + + @Autowired + private ISarFileSplitItemsParamsEOService sarFileSplitItemsParamsEOService; + + @Autowired + private IOSSFileService ossFileService; + + @Value("${jero.path.upload}") + private String filePath; + + @Value("${jero.path.upload}") + private String uploadFilePath; + + @ApiOperation(value = "|SarFileSplitItemsEO|分页查询") + @GetMapping("/getSplitItemsByPage") +// @RequiresPermissions("lawss:sarFileSplitItems:page") + public Result> page(SarFileSplitItemsEOPage page) throws Exception { + page.setValidFlag("0"); + //page.setOrderBy("regexp_replace(replace('.'||ITEMS_NUM, '.', '.00000000'), '0+([^\\.]{8})', '\\1')"); + page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + List rows = sarFileSplitItemsEOService.queryByPage(page); + if (rows != null && !rows.isEmpty()) { + for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { + SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); + paramPage.setItemId(sarFileSplitItemsEO.getId()); + List paramList = sarFileSplitItemsParamsEOService.queryByList(paramPage); + sarFileSplitItemsEO.setParamsList(paramList); + } + + } + IPage pageList = null; + pageList.setRecords(rows); + pageList.setCurrent(page.getPage()); + pageList.setSize(page.getPageSize()); + pageList.setTotal(sarFileSplitItemsEOService.queryByCount(page)); + return Result.OK(pageList); + } + @ApiOperation(value = "|SarFileSplitItemsEO|查看所有条款详情") + @GetMapping("/getAllSplitItems") + public Result> getAllSplitItems(SarFileSplitItemsEOPage page){ + page.setValidFlag("0"); + page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + List rows = sarFileSplitItemsEOService.queryByList2(page); + return Result.OK(rows); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|查询") + @GetMapping("") +// @RequiresPermissions("lawss:sarFileSplitItems:list") + public Result> list(SarFileSplitItemsEOPage page) throws Exception { + return Result.OK(sarFileSplitItemsEOService.queryByList(page)); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|详情") + @GetMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItems:get") + public Result find(@PathVariable String id) throws Exception { + return Result.OK(sarFileSplitItemsEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|新增") + @PostMapping("/addSplitItems") + public Result create(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { + if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) { + List itemValEOListNew = new ArrayList<>(); + for (SarFileSplitItemsValEO itemsValEO : sarFileSplitItemsEO.getItemValEOList()) { + itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); + itemValEOListNew.add(itemsValEO); + } + sarFileSplitItemsEO.setItemValEOList(itemValEOListNew); + } + + int resultCount = 0; + if(StringUtils.isBlank(sarFileSplitItemsEO.getId())){ + resultCount = sarFileSplitItemsEOService.addItemContent(sarFileSplitItemsEO); + }else{ + resultCount = sarFileSplitItemsEOService.updateItemContent(sarFileSplitItemsEO); + } + if (resultCount > 0) { + return Result.OK("新增成功",sarFileSplitItemsEO); + } else { + return Result.error("新增失败"); + } + } + + @ApiOperation(value = "|SarFileSplitItemsEO|修改") + @PutMapping("/updateSplitItems") + public Result update(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { + if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) { + List itemValEOListNew = new ArrayList<>(); + for (SarFileSplitItemsValEO itemsValEO : sarFileSplitItemsEO.getItemValEOList()) { + itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); + itemValEOListNew.add(itemsValEO); + } + sarFileSplitItemsEO.setItemValEOList(itemValEOListNew); + } + + int resultCount = sarFileSplitItemsEOService.updateItemContent(sarFileSplitItemsEO); + if (resultCount > 0) { + return Result.OK("修改成功",sarFileSplitItemsEO); + } else { + return Result.error("修改失败"); + } + } + + @ApiOperation(value = "|SarFileSplitItemsEO|暂存") + @PutMapping("/saveSplitItems") + public Result save(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { + if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) { + List itemValEOListNew = new ArrayList<>(); + for (SarFileSplitItemsValEO itemsValEO : sarFileSplitItemsEO.getItemValEOList()) { + itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); + itemValEOListNew.add(itemsValEO); + } + sarFileSplitItemsEO.setItemValEOList(itemValEOListNew); + } + + int resultCount = 0; + if(StringUtils.isBlank(sarFileSplitItemsEO.getId())){ + resultCount = sarFileSplitItemsEOService.addItemContent(sarFileSplitItemsEO); + }else{ + resultCount = sarFileSplitItemsEOService.updateItemContent(sarFileSplitItemsEO); + } + + if (resultCount > 0) { + return Result.OK("暂存成功",sarFileSplitItemsEO); + } else { + return Result.error("暂存失败"); + } + } + + @ApiOperation(value = "|SarFileSplitItemsEO|删除") + @DeleteMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItems:delete") + public Result delete(@PathVariable String id) throws Exception { + sarFileSplitItemsEOService.deleteByPrimaryKey(id); + logger.info("delete from SAR_FILE_SPLIT_ITEMS where id = {}", id); + return Result.OK(); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|批量删除") + @PostMapping("/batchDeleteItems") + public Result batchDeleteItems(String ids) throws Exception { + if (StringUtils.isNotEmpty(ids)) { + int result = sarFileSplitItemsEOService.batchDeleteItems(ids); + if (result > 0) { + return Result.OK("删除成功",null); + } else { + return Result.error("删除失败"); + } + + } else { + return Result.error("请选择要删除的数据"); + } + } + + @ApiOperation(value = "|SarFileSplitItemsEO|批量删除条款要求") + @PostMapping("/batchDeleteItemsVal") + public Result batchDeleteItemsVal(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { + if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) { + List itemValEOListNew = new ArrayList<>(); + for (SarFileSplitItemsValEO itemsValEO : sarFileSplitItemsEO.getItemValEOList()) { + itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); + itemValEOListNew.add(itemsValEO); + } + sarFileSplitItemsEO.setItemValEOList(itemValEOListNew); + } + + int resultCount = sarFileSplitItemsEOService.updateItemContentAfterBathDel(sarFileSplitItemsEO); + if (resultCount > 0) { + return Result.OK("批量删除成功",sarFileSplitItemsEO); + } else { + return Result.error("批量删除失败"); + } + } + + + @ApiOperation(value = "|SarFileSplitItemsEO|移动条款要求到指定目录") + @PostMapping("/moveSplitItemsVal") + public Result moveSplitItemsVal(@RequestBody SarFileSplitItemsEOPage page) throws Exception { + if(CollectionUtils.isNotEmpty(page.getTargetItemValEOList())) { + List itemValEOListNew = new ArrayList<>(); + for (SarFileSplitItemsValEO itemsValEO : page.getTargetItemValEOList()) { + itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); + itemValEOListNew.add(itemsValEO); + } + page.setTargetItemValEOList(itemValEOListNew); + } + + Map resultMsgMap = sarFileSplitItemsEOService.moveSplitItemsVal(page); + if ("0".equals(resultMsgMap.get("code"))) { + return Result.OK("移动成功"); + } else { + return Result.error(resultMsgMap.get("msg")); + } + } + + @ApiOperation(value = "|SarFileSplitItemsEO|根据id查询") + @GetMapping("/getInfoById") +// @RequiresPermissions("lawss:sarFileSplitItems:get") + public Result getInfoById(String id) throws Exception { + SarFileSplitItemsEO sarFileSplitItemsEO = sarFileSplitItemsEOService.selectByPrimaryKey(id); + if (sarFileSplitItemsEO != null) { + SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); + paramPage.setItemId(id); + List paramList = sarFileSplitItemsParamsEOService.queryByList(paramPage); + sarFileSplitItemsEO.setParamsList(paramList); + } + // 查询特殊参数要求信息 + return Result.OK(sarFileSplitItemsEO); + } + + @ApiOperation(value = "判断包含子节点") + @GetMapping("/judgeContaintChilds") + /*@RequiresPermissions("lawss:sarMenu:judgequeryMenuByPid")*/ + public Result> judgeContaintChilds(String ids) throws Exception { + Map result = sarFileSplitItemsEOService.judgeContaintChilds(ids); + return Result.OK(result); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|导出zip") + @GetMapping(value = "/exportSplitInfoZip") + public void exportSplitInfoZip(String idList, String infoId,String exportName, HttpServletResponse response, HttpServletRequest request) throws Exception { + OutputStream os = null; + OutputStream excelOS = null; + HSSFWorkbook workbook = new HSSFWorkbook(); + String fileOriName = "拆分条款信息"; + if (StringUtils.isNotEmpty(exportName)) { + fileOriName = exportName; + } + try{ + //创建临时文件夹 + String fileNowPath = uploadFilePath + "/tempZip/" + UUID.randomUUID().toString().replace("-","") + "/" + fileOriName; + File nowFile = new File(fileNowPath); + if (nowFile.exists()){ + nowFile.delete(); + } + nowFile.mkdirs(); + String fileName = fileOriName + ".xls"; + HSSFSheet sheetItems = workbook.createSheet("条款内容"); + String[] headers = {"条款号","条款名称","条款内容"}; + HSSFCellStyle cellStyle =workbook.createCellStyle(); + cellStyle.setWrapText(true); +// cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); + cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); + HSSFCellStyle cellStyle1 =workbook.createCellStyle(); + cellStyle1.setAlignment(HSSFCellStyle.ALIGN_CENTER); + HSSFCellStyle cellStyleLink =workbook.createCellStyle(); + HSSFFont font = workbook.createFont(); + font.setColor(HSSFColor.LIGHT_BLUE.index); + cellStyleLink.setFont(font); + cellStyleLink.setWrapText(true); + List itemIdList = new ArrayList<>(); + SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); + if (StringUtils.isNotEmpty(idList)) { + String[] idArr = idList.split(","); + itemIdList = Arrays.asList(idArr); + page.setIdList(itemIdList); + } + //查询全部条款 + page.setInfoId(infoId); + page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + List allItemsList = sarFileSplitItemsEOService.queryByOrdersForExport(page); + List allTableList = new ArrayList<>(); + List allImgList = new ArrayList<>(); + List allRelevFileList = new ArrayList<>(); + int countMaxFile = 1; + if (allItemsList != null && !allItemsList.isEmpty()) { + for (FileSplitItemsExportDto itemsExportDto : allItemsList) { + SarFileSplitItemsValEOPage valEOPage = new SarFileSplitItemsValEOPage(); + valEOPage.setItemId(itemsExportDto.getId()); + valEOPage.setOrderBy("DISPLAY_SEQ,ID"); + List getValList = sarFileSplitItemsValEOService.queryByList(valEOPage); + List valContentList = sarFileSplitItemsEOService.combineItemValInfo(getValList,allTableList,allImgList,page); + itemsExportDto.setItemValContent(valContentList); + } + } + // 在excel表中添加表头 + HSSFRow row = sheetItems.createRow(0); + sheetItems.setColumnWidth(0,10*256); + sheetItems.setColumnWidth(1,20*256); + sheetItems.setColumnWidth(2,100*256); + //导出目前只需要条款号、条款名称、条款内容 + +// sheetItems.setColumnWidth(3,20*256); +// sheetItems.setColumnWidth(4,20*256); +// sheetItems.setColumnWidth(5,20*256); +// sheetItems.setColumnWidth(6,20*256); +// sheetItems.setColumnWidth(7,20*256); +// sheetItems.setColumnWidth(8,20*256); +// sheetItems.setColumnWidth(9,40*256); + for (int i = 0; i < headers.length; i++) { + HSSFCell cell = row.createCell(i); + HSSFRichTextString text = new HSSFRichTextString(headers[i]); + cell.setCellValue(text); + cell.setCellStyle(cellStyle1); + } + //放文字内容 + int allRow = 0; + for(int rowNum = 0;rowNum < allItemsList.size(); rowNum++){ + FileSplitItemsExportDto exportDto = allItemsList.get(rowNum); + List valList = exportDto.getItemValContent(); + int countFile = 0; + if(valList != null && !valList.isEmpty()){ + int startRow = allRow + 1; + for (int valRow=0;valRow -1) { + content = content.substring(0,content.lastIndexOf("\n")); + } + } + if("TABLE".equals(valList.get(valRow).getValType())){ + /* 连接跳转*/ + CreationHelper createHelper = workbook.getCreationHelper(); + Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.DOCUMENT); + String tableName = "#\'"+ content + "\'!A1"; + hyperlink1.setAddress(tableName); + cell2.setHyperlink(hyperlink1);// 链接 + row1.getCell(2).setCellStyle(cellStyleLink); + } else if ("IMG".equals(valList.get(valRow).getValType())) { + /* 连接跳转*/ + CreationHelper createHelper = workbook.getCreationHelper(); + Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.FILE); + String imgName = content; + hyperlink1.setAddress(imgName); + cell2.setHyperlink(hyperlink1);// 链接 + row1.getCell(2).setCellStyle(cellStyleLink); + } + cell2.setCellValue(content); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +// if (exportDto.getNewcarPutTime() != null) { +// String time= sdf.format(exportDto.getNewcarPutTime()); +// row1.createCell(3).setCellValue(time); +// row1.getCell(3).setCellStyle(cellStyle); +// } +// if (exportDto.getProductPutTime() != null) { +// String time= sdf.format(exportDto.getProductPutTime()); +// row1.createCell(4).setCellValue(time); +// row1.getCell(4).setCellStyle(cellStyle); +// } +// row1.createCell(5).setCellValue(exportDto.getSvpps()); +// row1.getCell(5).setCellStyle(cellStyle); +// row1.createCell(6).setCellValue(exportDto.getApplyArctic()); +// row1.getCell(6).setCellStyle(cellStyle); +// row1.createCell(7).setCellValue(exportDto.getReferenceStand()); +// row1.getCell(7).setCellStyle(cellStyle); +// row1.createCell(8).setCellValue(exportDto.getRemarks()); +// row1.getCell(8).setCellStyle(cellStyle); +// if (StringUtils.isNotEmpty(exportDto.getRelevanceFile())) { +// List fileList = attFileEOService.getMultiFileInfos(exportDto.getRelevanceFile()); +// if (fileList != null && !fileList.isEmpty()) { +// if (countMaxFile < fileList.size()) { +// countMaxFile = fileList.size(); +// } +// countFile = 0; +// for (AttFileEO attFileEO : fileList) { +// /* 连接跳转*/ +// String releFileName = attFileEO.getOldFileName(); +// CreationHelper createHelper = workbook.getCreationHelper(); +// Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.URL); +//// String addr = new String(releFileName.getBytes(),"UTF-8"); +// hyperlink1.setAddress(releFileName); +// row1.createCell(9+countFile).setHyperlink(hyperlink1); +// row1.createCell(9+countFile).setCellValue(releFileName); +// row1.getCell(9+countFile).setCellStyle(cellStyleLink); +// countFile++; +// } +// allRelevFileList.addAll(fileList); +// } +// } + } + if (allRow > startRow) { + sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,0,0)); + sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,1,1)); +// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,3,3)); +// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,4,4)); +// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,5,5)); +// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,6,6)); +// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,7,7)); +// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,8,8)); +// if (countFile > 0) { +// for (int i=0;i<=countFile;i++) { +// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,9+i,9+i)); +// } +// } + } + } else { + allRow++; + HSSFRow row1 = sheetItems.createRow(allRow); + row1.createCell(0).setCellValue(exportDto.getItemsNum()); + row1.getCell(0).setCellStyle(cellStyle); + row1.createCell(1).setCellValue(exportDto.getItemsName()); + row1.getCell(1).setCellStyle(cellStyle); + row1.createCell(2).setCellValue(""); + row1.getCell(2).setCellStyle(cellStyle); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +// if (exportDto.getNewcarPutTime() != null) { +// String time= sdf.format(exportDto.getNewcarPutTime()); +// row1.createCell(3).setCellValue(time); +// row1.getCell(3).setCellStyle(cellStyle); +// } +// if (exportDto.getProductPutTime() != null) { +// String time= sdf.format(exportDto.getProductPutTime()); +// row1.createCell(4).setCellValue(time); +// row1.getCell(4).setCellStyle(cellStyle); +// } +// row1.createCell(5).setCellValue(exportDto.getSvpps()); +// row1.getCell(5).setCellStyle(cellStyle); +// row1.createCell(6).setCellValue(exportDto.getApplyArctic()); +// row1.getCell(6).setCellStyle(cellStyle); +// row1.createCell(7).setCellValue(exportDto.getReferenceStand()); +// row1.getCell(7).setCellStyle(cellStyle); +// row1.createCell(8).setCellValue(exportDto.getRemarks()); +// row1.getCell(8).setCellStyle(cellStyle); +// if (StringUtils.isNotEmpty(exportDto.getRelevanceFile())) { +// List fileList = attFileEOService.getMultiFileInfos(exportDto.getRelevanceFile()); +// if (fileList != null && !fileList.isEmpty()) { +// countFile = 0; +// for (AttFileEO attFileEO : fileList) { +// /* 连接跳转*/ +// String releFileName = attFileEO.getOldFileName(); +// CreationHelper createHelper = workbook.getCreationHelper(); +// Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.URL); +//// String addr = new String(releFileName.getBytes(),"UTF-8"); +// hyperlink1.setAddress(releFileName); +// row1.createCell(9+countFile).setHyperlink(hyperlink1); +// row1.createCell(9+countFile).setCellValue(releFileName); +// row1.getCell(9+countFile).setCellStyle(cellStyleLink); +// countFile++; +// } +// allRelevFileList.addAll(fileList); +// } +// } + } + } + if (countMaxFile > 1) { + for (int i=1;i> rowtableList = tableExportDto.getTableEOList(); +// HSSFSheet sheetTable = workbook.createSheet(tableExportDto.getTableName()); + String tableName = tableExportDto.getTableName(); + String tableHtml = tableExportDto.getTableHtCon(); + if (StringUtils.isNotEmpty(tableHtml) && tableHtml.indexOf("") < 0) { + if (tableHtml.indexOf("") < 0) { + tableHtml = tableHtml.replaceFirst("",""); + tableHtml = tableHtml.replaceFirst("",""); + } else { + tableHtml = tableHtml.replaceFirst("",""); + tableHtml = tableHtml.replaceFirst("",""); + } + } + String cnt = "\n"; + tableHtml = tableHtml.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt); + workbook = ConvertHtml2Excel.table2Excel(tableHtml,workbook,tableName); +// for (int r=0;r colTableList = rowtableList.get(r); +// HSSFRow tRow = sheetTable.createRow(colTableList.get(0).getRowNum()-1); +// for(int c=0;c importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file, + @RequestParam(value = "menuId", required = false) String menuId, + @RequestParam(value = "infoId", required = false) String infoId) throws Exception { + //验证文件名是否合格 + /* 截取后缀名 */ + int pos = file.getOriginalFilename().lastIndexOf("."); + String str = file.getOriginalFilename().substring(pos+1).toLowerCase(); + String filenameorg = file.getOriginalFilename().substring(0,pos); + //判断上传文件必须是zip + if (!str.equals("zip")) { + return Result.error("请上传zip文件"); + } + String path = filePath + "/modal/"+filenameorg; + File saveDirectory = new File(path); + if(!saveDirectory.isDirectory()){ + saveDirectory.mkdir(); + } + FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path +"/"+ file.getOriginalFilename())); + try{ + //解压缩 + String zipEntryName = FileUnZip.unZipFiles(path +"/"+ file.getOriginalFilename(),path); + // 数据相关处理, + // 1.获取其中的Excel, + List excelfilelist = FileUnZip.readExcelFile(zipEntryName); + if(excelfilelist.size()<1){ + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("压缩包内没有上传Excel数据"); + } else if (excelfilelist.size()>1) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("压缩包内有多个Excel数据源"); + } + File excelfile = excelfilelist.get(0); + // 导入参数设置，默认即可 + ImportParams params = new ImportParams(); + try { + String fields[] = {"条款号", "条款名称","条款内容","新车型实施日期", + "在产车实施日期","关联零部件","适用车型","引用标准","备注","关联文件"}; + params.setImportFields(fields); + List result = new ArrayList<>(); + // 解析excel，并返回校验信息 + result = ExcelImportUtil.importExcel(excelfile, SarFileSplitItemsImportDto.class, params); + Long getExcelInfo = System.currentTimeMillis(); + //excel读取到的数据 + List datas = result; + if(datas!=null &&!datas.isEmpty()){ + try { + //获取全部sheet页中表格 + XSSFWorkbook workbook=new XSSFWorkbook(new FileInputStream(excelfile)); + XSSFSheet sheet=null; + List getSheetTableList = new ArrayList(); + for (int i = 1; i < workbook.getNumberOfSheets(); i++) {//获取每个Sheet表 + sheet = workbook.getSheetAt(i); + SplitTableInfo splitTableInfo = new SplitTableInfo(); + splitTableInfo.setTableName(sheet.getSheetName()); + String tableHtml = POIReadExcelToHtml.readExcelToHtml(workbook,i,false); + splitTableInfo.setTableHtml(tableHtml); + getSheetTableList.add(splitTableInfo); + } + int i = 0 ; + List datasUpdate = new ArrayList<>(); + //2019.05.14 当读取exceL出现空行过多时，空行数为20以上时中断读取，将数据清洗为新的list + for(SarFileSplitItemsImportDto sarStandImportDto :datas){ + if(i>20){ + break; + } + //判断此行数据是否全部为空 + if(checkObjAllFieldsIsNull(sarStandImportDto)){ + i++; + //是则不读取 + continue; + } + i = 0; + datasUpdate.add(sarStandImportDto); + } + String unzipfilepath = zipEntryName; + Result message = sarFileSplitItemsEOService.importSplitItems(datasUpdate,menuId,unzipfilepath,infoId,getSheetTableList); + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return message; + } catch (Exception e) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error(e.getMessage()); + } + }else{ + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("没有可导入的数据,请检查!"); + } + } catch (NoSuchElementException e){ + FileUnZip.deleteDir(saveDirectory); + return Result.error("没有可导入的数据,请检查!"); + } catch (Exception e) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error( "读取失败，请严格按照模板文件导入数据"); + } + } catch (Exception e) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("读取失败，请严格按照模板文件导入数据"); + } + + } + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsFileEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsFileEOController.java new file mode 100644 index 000000000..0b9806872 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsFileEOController.java @@ -0,0 +1,108 @@ +package com.jero.modules.split.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.split.entity.SarFileSplitItemsFileEO; +import com.jero.modules.split.page.SarFileSplitItemsFileEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsFileEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/split/sarFileSplitItemsFile") +@Api(tags = "文档拆分") +public class SarFileSplitItemsFileEOController extends JeroController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsFileEOController.class); + + @Autowired + private ISarFileSplitItemsFileEOService sarFileSplitItemsFileEOService; + + @Autowired + private IOSSFileService ossFileService; + + @ApiOperation(value = "|SarFileSplitItemsFileEO|分页查询") + @GetMapping("/page") + @RequiresPermissions("lawss:sarFileSplitItemsFile:page") + public Result> page(SarFileSplitItemsFileEOPage page) throws Exception { + List rows = sarFileSplitItemsFileEOService.queryByPage(page); + IPage pageList = null; + pageList.setRecords(rows); + pageList.setCurrent(page.getPage()); + pageList.setSize(page.getPageSize()); + pageList.setTotal(sarFileSplitItemsFileEOService.queryByCount(page)); + return Result.OK(pageList); + } + + @ApiOperation(value = "|SarFileSplitItemsFileEO|查询") + @GetMapping("") + @RequiresPermissions("lawss:sarFileSplitItemsFile:list") + public Result> list(SarFileSplitItemsFileEOPage page) throws Exception { + return Result.OK(sarFileSplitItemsFileEOService.queryByList(page)); + } + + @ApiOperation(value = "|SarFileSplitItemsFileEO|详情") + @GetMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItemsFile:get") + public Result find(@PathVariable String id) throws Exception { + return Result.OK(sarFileSplitItemsFileEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitItemsFileEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("lawss:sarFileSplitItemsFile:save") + public Result create(@RequestBody SarFileSplitItemsFileEO sarFileSplitItemsFileEO) throws Exception { + sarFileSplitItemsFileEOService.insertSelective(sarFileSplitItemsFileEO); + return Result.OK(sarFileSplitItemsFileEO); + } + + @ApiOperation(value = "|SarFileSplitItemsFileEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("lawss:sarFileSplitItemsFile:update") + public Result update(@RequestBody SarFileSplitItemsFileEO sarFileSplitItemsFileEO) throws Exception { + sarFileSplitItemsFileEOService.updateByPrimaryKeySelective(sarFileSplitItemsFileEO); + return Result.OK(sarFileSplitItemsFileEO); + } + + @ApiOperation(value = "|SarFileSplitItemsFileEO|删除") + @DeleteMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItemsFile:delete") + public Result delete(@PathVariable String id) throws Exception { + sarFileSplitItemsFileEOService.deleteByPrimaryKey(id); + logger.info("delete from SAR_FILE_SPLIT_ITEMS_FILE where id = {}", id); + return Result.OK(); + } + + @ApiOperation(value = "|SarFileSplitItemsFileEO|查询转换后的文档详情") + @GetMapping("/queryConvertAtt") + /*@RequiresPermissions("lawss:sarLawsFile:list")*/ + public Result queryConvertAtt(String attId) throws Exception { + List getList = sarFileSplitItemsFileEOService.selectFileByAttId(attId); + SarFileSplitItemsFileEO sarBussStandFileEO = new SarFileSplitItemsFileEO(); + if(getList != null && !getList.isEmpty()){ + sarBussStandFileEO = getList.get(0); + OSSFile ossFile = ossFileService.getById(attId); + if(ossFile != null){ + sarBussStandFileEO.setFileOldName(ossFile.getFileName()); + } +// readStandOrLawsLogService.sendReadSOLLog("STAND",sarBussStandFileEO); + return Result.OK(sarBussStandFileEO); + } else { + return Result.OK(null); + } + + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsParamsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsParamsEOController.java new file mode 100644 index 000000000..94853a7ff --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsParamsEOController.java @@ -0,0 +1,83 @@ +package com.jero.modules.split.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.split.entity.SarFileSplitItemsParamsEO; +import com.jero.modules.split.page.SarFileSplitItemsParamsEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsParamsEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/split/sarFileSplitItemsParams") +@Api(tags = "文档拆分") +public class SarFileSplitItemsParamsEOController extends JeroController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsParamsEOController.class); + + @Autowired + private ISarFileSplitItemsParamsEOService sarFileSplitItemsParamsEOService; + + @ApiOperation(value = "|SarFileSplitItemsParamsEO|分页查询") + @GetMapping("/page") + @RequiresPermissions("lawss:sarFileSplitItemsParams:page") + public Result> page(SarFileSplitItemsParamsEOPage page) throws Exception { + List rows = sarFileSplitItemsParamsEOService.queryByPage(page); + IPage pageList = null; + pageList.setRecords(rows); + pageList.setCurrent(page.getPage()); + pageList.setSize(page.getPageSize()); + pageList.setTotal(sarFileSplitItemsParamsEOService.queryByCount(page)); + return Result.OK(pageList); + } + + @ApiOperation(value = "|SarFileSplitItemsParamsEO|查询") + @GetMapping("") + @RequiresPermissions("lawss:sarFileSplitItemsParams:list") + public Result> list(SarFileSplitItemsParamsEOPage page) throws Exception { + return Result.OK(sarFileSplitItemsParamsEOService.queryByList(page)); + } + + @ApiOperation(value = "|SarFileSplitItemsParamsEO|详情") + @GetMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItemsParams:get") + public Result find(@PathVariable String id) throws Exception { + return Result.OK(sarFileSplitItemsParamsEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitItemsParamsEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("lawss:sarFileSplitItemsParams:save") + public Result create(@RequestBody SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) throws Exception { + sarFileSplitItemsParamsEOService.insertSelective(sarFileSplitItemsParamsEO); + return Result.OK(sarFileSplitItemsParamsEO); + } + + @ApiOperation(value = "|SarFileSplitItemsParamsEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("lawss:sarFileSplitItemsParams:update") + public Result update(@RequestBody SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) throws Exception { + sarFileSplitItemsParamsEOService.updateByPrimaryKeySelective(sarFileSplitItemsParamsEO); + return Result.OK(sarFileSplitItemsParamsEO); + } + + @ApiOperation(value = "|SarFileSplitItemsParamsEO|删除") + @DeleteMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItemsParams:delete") + public Result delete(@PathVariable String id) throws Exception { + sarFileSplitItemsParamsEOService.deleteByPrimaryKey(id); + logger.info("delete from SAR_FILE_SPLIT_ITEMS_PARAMS where id = {}", id); + return Result.OK(); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsResEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsResEOController.java new file mode 100644 index 000000000..fc2f82c2e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsResEOController.java @@ -0,0 +1,83 @@ +package com.jero.modules.split.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.split.entity.SarFileSplitItemsResEO; +import com.jero.modules.split.page.SarFileSplitItemsResEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsResEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/split/sarFileSplitItemsRes") +@Api(tags = "文档拆分") +public class SarFileSplitItemsResEOController extends JeroController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsResEOController.class); + + @Autowired + private ISarFileSplitItemsResEOService sarFileSplitItemsResEOService; + + @ApiOperation(value = "|SarFileSplitItemsResEO|分页查询") + @GetMapping("/page") + @RequiresPermissions("lawss:sarFileSplitItemsRes:page") + public Result> page(SarFileSplitItemsResEOPage page) throws Exception { + List rows = sarFileSplitItemsResEOService.queryByPage(page); + IPage pageList = null; + pageList.setRecords(rows); + pageList.setCurrent(page.getPage()); + pageList.setSize(page.getPageSize()); + pageList.setTotal(sarFileSplitItemsResEOService.queryByCount(page)); + return Result.OK(pageList); + } + + @ApiOperation(value = "|SarFileSplitItemsResEO|查询") + @GetMapping("") + @RequiresPermissions("lawss:sarFileSplitItemsRes:list") + public Result> list(SarFileSplitItemsResEOPage page) throws Exception { + return Result.OK(sarFileSplitItemsResEOService.queryByList(page)); + } + + @ApiOperation(value = "|SarFileSplitItemsResEO|详情") + @GetMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItemsRes:get") + public Result find(@PathVariable String id) throws Exception { + return Result.OK(sarFileSplitItemsResEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitItemsResEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("lawss:sarFileSplitItemsRes:save") + public Result create(@RequestBody SarFileSplitItemsResEO sarFileSplitItemsResEO) throws Exception { + sarFileSplitItemsResEOService.insertSelective(sarFileSplitItemsResEO); + return Result.OK(sarFileSplitItemsResEO); + } + + @ApiOperation(value = "|SarFileSplitItemsResEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("lawss:sarFileSplitItemsRes:update") + public Result update(@RequestBody SarFileSplitItemsResEO sarFileSplitItemsResEO) throws Exception { + sarFileSplitItemsResEOService.updateByPrimaryKeySelective(sarFileSplitItemsResEO); + return Result.OK(sarFileSplitItemsResEO); + } + + @ApiOperation(value = "|SarFileSplitItemsResEO|删除") + @DeleteMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItemsRes:delete") + public Result delete(@PathVariable String id) throws Exception { + sarFileSplitItemsResEOService.deleteByPrimaryKey(id); + logger.info("delete from SAR_FILE_SPLIT_ITEMS_RES where id = {}", id); + return Result.OK(); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsTableEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsTableEOController.java new file mode 100644 index 000000000..13e1a13ea --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsTableEOController.java @@ -0,0 +1,83 @@ +package com.jero.modules.split.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.split.entity.SarFileSplitItemsTableEO; +import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsTableEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/split/sarFileSplitItemsTable") +@Api(tags = "文档拆分") +public class SarFileSplitItemsTableEOController extends JeroController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsTableEOController.class); + + @Autowired + private ISarFileSplitItemsTableEOService sarFileSplitItemsTableEOService; + + @ApiOperation(value = "|SarFileSplitItemsTableEO|分页查询") + @GetMapping("/page") + @RequiresPermissions("lawss:sarFileSplitItemsTable:page") + public Result> page(SarFileSplitItemsTableEOPage page) throws Exception { + List rows = sarFileSplitItemsTableEOService.queryByPage(page); + IPage pageList = null; + pageList.setRecords(rows); + pageList.setCurrent(page.getPage()); + pageList.setSize(page.getPageSize()); + pageList.setTotal(sarFileSplitItemsTableEOService.queryByCount(page)); + return Result.OK(pageList); + } + + @ApiOperation(value = "|SarFileSplitItemsTableEO|查询") + @GetMapping("") + @RequiresPermissions("lawss:sarFileSplitItemsTable:list") + public Result> list(SarFileSplitItemsTableEOPage page) throws Exception { + return Result.OK(sarFileSplitItemsTableEOService.queryByList(page)); + } + + @ApiOperation(value = "|SarFileSplitItemsTableEO|详情") + @GetMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItemsTable:get") + public Result find(@PathVariable String id) throws Exception { + return Result.OK(sarFileSplitItemsTableEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitItemsTableEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("lawss:sarFileSplitItemsTable:save") + public Result create(@RequestBody SarFileSplitItemsTableEO sarFileSplitItemsTableEO) throws Exception { + sarFileSplitItemsTableEOService.insertSelective(sarFileSplitItemsTableEO); + return Result.OK(sarFileSplitItemsTableEO); + } + + @ApiOperation(value = "|SarFileSplitItemsTableEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("lawss:sarFileSplitItemsTable:update") + public Result update(@RequestBody SarFileSplitItemsTableEO sarFileSplitItemsTableEO) throws Exception { + sarFileSplitItemsTableEOService.updateByPrimaryKeySelective(sarFileSplitItemsTableEO); + return Result.OK(sarFileSplitItemsTableEO); + } + + @ApiOperation(value = "|SarFileSplitItemsTableEO|删除") + @DeleteMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItemsTable:delete") + public Result delete(@PathVariable String id) throws Exception { + sarFileSplitItemsTableEOService.deleteByPrimaryKey(id); + logger.info("delete from SAR_FILE_SPLIT_ITEMS_TABLE where id = {}", id); + return Result.OK(); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java new file mode 100644 index 000000000..b0eae6e4b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java @@ -0,0 +1,132 @@ +package com.jero.modules.split.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsEOService; +import com.jero.modules.split.service.ISarFileSplitItemsTableEOService; +import com.jero.modules.split.service.ISarFileSplitItemsValEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/split/sarFileSplitItemsVal") +@Api(tags = "文档拆分条目信息") +public class SarFileSplitItemsValEOController extends JeroController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsValEOController.class); + + @Autowired + private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService; + + @Autowired + private ISarFileSplitItemsTableEOService sarFileSplitItemsTableEOService; + + @Autowired + private ISarFileSplitItemsEOService sarFileSplitItemsEOService; + + @ApiOperation(value = "|SarFileSplitItemsValEO|分页查询") + @GetMapping("/page") + @RequiresPermissions("lawss:sarFileSplitItemsVal:page") + public Result> page(SarFileSplitItemsValEOPage page) throws Exception { + List rows = sarFileSplitItemsValEOService.queryByPage(page); + IPage pageList = null; + pageList.setRecords(rows); + pageList.setCurrent(page.getPage()); + pageList.setSize(page.getPageSize()); + pageList.setTotal(sarFileSplitItemsValEOService.queryByCount(page)); + return Result.OK(pageList); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|查询") + @GetMapping("/getItemsValList") +// @RequiresPermissions("lawss:sarFileSplitItemsVal:list") + public Result> list(SarFileSplitItemsValEOPage page) throws Exception { + page.setOrderBy("DISPLAY_SEQ,ID"); + List getList = sarFileSplitItemsValEOService.queryByList(page); + if (getList != null && !getList.isEmpty()) { + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) { + String imgPath = sarFileSplitItemsValEO.getItemContent(); + if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) { + String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length()); +// String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.lastIndexOf("’")); + sarFileSplitItemsValEO.setImgName(imgName); + } + /*else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) { + SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); + tablePage.setItemsValId(sarFileSplitItemsValEO.getId()); + List tableList = sarFileSplitItemsTableEOService.queryByList(tablePage); + List tableListRow = sarFileSplitItemsTableEOService.queryByRowNum(tablePage); + sarFileSplitItemsValEO.setTableList(tableList); + if (tableListRow != null && !tableListRow.isEmpty()) { + List> getTableList = new ArrayList<>(); + for (int i=1; i <= tableListRow.size();i++) { + List rowList = new ArrayList<>(); + for (int j=0; j < tableList.size();j++) { + if (tableList.get(j).getRowNum() == i) { + rowList.add(tableList.get(j)); + } + } + getTableList.add(rowList); + } + sarFileSplitItemsValEO.setTableListShow(getTableList); + } + }*/ + } + } + return Result.OK(getList); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|详情") + @GetMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItemsVal:get") + public Result find(@PathVariable String id) throws Exception { + return Result.OK(sarFileSplitItemsValEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("lawss:sarFileSplitItemsVal:save") + public Result create(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { + sarFileSplitItemsValEOService.insertSelective(sarFileSplitItemsValEO); + return Result.OK(sarFileSplitItemsValEO); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("lawss:sarFileSplitItemsVal:update") + public Result update(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { + sarFileSplitItemsValEOService.updateByPrimaryKeySelective(sarFileSplitItemsValEO); + return Result.OK(sarFileSplitItemsValEO); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|删除") + @DeleteMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitItemsVal:delete") + public Result delete(@PathVariable String id) throws Exception { + sarFileSplitItemsValEOService.deleteByPrimaryKey(id); + logger.info("delete from SAR_FILE_SPLIT_ITEMS_VAL where id = {}", id); + return Result.OK(); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|根据目录查询") + @GetMapping("/getSplitItemsByMenu") +// @RequiresPermissions("lawss:sarFileSplitItems:page") + public Result> getSplitItemsByMenu(String menuId, String infoId) throws Exception { + List getList = sarFileSplitItemsValEOService.getSplitItemsByMenu(menuId,infoId); + return Result.OK(getList); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java new file mode 100644 index 000000000..1d148c940 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java @@ -0,0 +1,152 @@ +package com.jero.modules.split.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.split.entity.DrageMenuEO; +import com.jero.modules.split.entity.SarFileSplitItemsEO; +import com.jero.modules.split.entity.SarFileSplitMenuEO; +import com.jero.modules.split.mapper.SarFileSplitItemsEOMapper; +import com.jero.modules.split.page.SarFileSplitMenuEOPage; +import com.jero.modules.split.service.ISarFileSplitMenuEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +@RestController +@RequestMapping("/split/sarFileSplitMenu") +@Api(tags = "文档拆分条款目录") +public class SarFileSplitMenuEOController extends JeroController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitMenuEOController.class); + + @Autowired + private ISarFileSplitMenuEOService sarFileSplitMenuEOService; + + @Autowired + private SarFileSplitItemsEOMapper sarFileSplitItemsEOMapper; + + @ApiOperation(value = "|SarFileSplitMenuEO|分页查询") + @GetMapping("/page") + @RequiresPermissions("lawss:sarFileSplitMenu:page") + public Result> page(SarFileSplitMenuEOPage page) throws Exception { + List rows = sarFileSplitMenuEOService.queryByPage(page); + IPage pageList = null; + pageList.setRecords(rows); + pageList.setCurrent(page.getPage()); + pageList.setSize(page.getPageSize()); + pageList.setTotal(sarFileSplitMenuEOService.queryByCount(page)); + return Result.OK(pageList); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|查询") + @GetMapping("getSplitMenusByInfoId") + //@RequiresPermissions("lawss:sarFileSplitMenu:list") + public Result> list(SarFileSplitMenuEOPage page) throws Exception { + page.setValidFlag("0"); + // page.setOrderBy("regexp_replace(replace('.'||NAME, '.', '.00000000'), '0+([^\\.]{8})', '\\1')"); + page.setOrderBy("display_seq asc"); + List getList = sarFileSplitMenuEOService.queryByList(page); + return Result.OK(getList); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|详情") + @GetMapping("/{id}") + @RequiresPermissions("lawss:sarFileSplitMenu:get") + public Result find(@PathVariable String id) throws Exception { + return Result.OK(sarFileSplitMenuEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|新增") + @PostMapping("/addMenu") +// @RequiresPermissions("lawss:sarFileSplitMenu:save") + public Result create(SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { + sarFileSplitMenuEOService.addMenu(sarFileSplitMenuEO); + return Result.OK("新增成功",sarFileSplitMenuEO); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|修改") + @PutMapping("/updateMenu") +// @RequiresPermissions("lawss:sarFileSplitMenu:update") + public Result update(SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { + sarFileSplitMenuEOService.updateByPrimaryKeySelective(sarFileSplitMenuEO); + return Result.OK("修改成功",sarFileSplitMenuEO); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|删除") + @DeleteMapping("/deleteMenu") +// @RequiresPermissions("lawss:sarFileSplitMenu:delete") + public Result delete(String id) throws Exception { + sarFileSplitMenuEOService.deleteMenu(id); + return Result.OK("删除成功",null); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|拖拽节点") + @PostMapping("/dragMenu") + public Result dragMenu(@RequestBody DrageMenuEO drageMenuEO) throws Exception { + sarFileSplitMenuEOService.dragMenu(drageMenuEO); + return Result.OK("修改成功",drageMenuEO); + } + + @ApiOperation(value = "查询子节点") + @PostMapping("/judgequeryMenuByPid") + /*@RequiresPermissions("lawss:sarMenu:judgequeryMenuByPid")*/ + public Result judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception { + return Result.OK(sarFileSplitMenuEOService.judgequeryMenuByPid(sarMenuEO)); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|复制节点包括子节点") + @PostMapping("/copyMenu") + public Result copyMenu(@RequestBody SarFileSplitMenuEO sarMenuEO) throws Exception { + int result = sarFileSplitMenuEOService.copyMenu(sarMenuEO); + return Result.OK("复制成功",sarMenuEO); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|复制节点不包括子节点") + @PostMapping("/copyMenuNotChildren") + public Result copyMenuNotChildren(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { + int result = sarFileSplitMenuEOService.copyMenuNotChildren(sarFileSplitItemsEO); + return Result.OK("复制成功",sarFileSplitItemsEO); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|批量复制节点不包括子节点") + @PostMapping("/copyMenuNotChildrenall") + public Result> copyMenuNotChildrenall(@RequestParam(value = "ids",required = false) String ids, + @RequestParam(value = "menuids",required = false) String menuids, + @RequestParam(value = "infoIds",required = false) String infoIds) throws Exception { + /*int result = sarFileSplitMenuEOService.copyMenuNotChildren(sarFileSplitItemsEO); + return Result.OK("0","复制成功",sarFileSplitItemsEO);*/ + String idsl[] = ids.split(","); + List idlist =new ArrayList<>(); + idlist = Arrays.asList(idsl); + + String menuidss[] = menuids.split(","); + List menuidslist =new ArrayList<>(); + menuidslist = Arrays.asList(menuidss); + + + String infoIdss[] = infoIds.split(","); + List infoIdslist =new ArrayList<>(); + infoIdslist = Arrays.asList(infoIdss); + List sarFileSplitItemsEOS = new ArrayList<>(); + for(int i=0;i> tableEOList; + + private String tableHtCon; + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public List> getTableEOList() { + return tableEOList; + } + + public void setTableEOList(List> tableEOList) { + this.tableEOList = tableEOList; + } + + public String getTableHtCon() { + return tableHtCon; + } + + public void setTableHtCon(String tableHtCon) { + this.tableHtCon = tableHtCon; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitItemsExportDto.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitItemsExportDto.java new file mode 100644 index 000000000..28a06a2e8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitItemsExportDto.java @@ -0,0 +1,138 @@ +package com.jero.modules.split.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; +import java.util.List; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/2/13 9:48 + */ +public class FileSplitItemsExportDto { + private String id; + + private String itemsNum; + + private String itemsName; + + private String itermsConditions; + + private String type; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date newcarPutTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date productPutTime; + private String svpps; + private String applyArctic; + private String referenceStand; + private String remarks; + private String relevanceFile; + + private List itemValContent; + + public String getItemsNum() { + return itemsNum; + } + + public void setItemsNum(String itemsNum) { + this.itemsNum = itemsNum; + } + + public String getItemsName() { + return itemsName; + } + + public void setItemsName(String itemsName) { + this.itemsName = itemsName; + } + + public String getItermsConditions() { + return itermsConditions; + } + + public void setItermsConditions(String itermsConditions) { + this.itermsConditions = itermsConditions; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public List getItemValContent() { + return itemValContent; + } + + public void setItemValContent(List itemValContent) { + this.itemValContent = itemValContent; + } + + public Date getNewcarPutTime() { + return newcarPutTime; + } + + public void setNewcarPutTime(Date newcarPutTime) { + this.newcarPutTime = newcarPutTime; + } + + public Date getProductPutTime() { + return productPutTime; + } + + public void setProductPutTime(Date productPutTime) { + this.productPutTime = productPutTime; + } + + public String getSvpps() { + return svpps; + } + + public void setSvpps(String svpps) { + this.svpps = svpps; + } + + public String getApplyArctic() { + return applyArctic; + } + + public void setApplyArctic(String applyArctic) { + this.applyArctic = applyArctic; + } + + public String getReferenceStand() { + return referenceStand; + } + + public void setReferenceStand(String referenceStand) { + this.referenceStand = referenceStand; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getRelevanceFile() { + return relevanceFile; + } + + public void setRelevanceFile(String relevanceFile) { + this.relevanceFile = relevanceFile; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValExportDto.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValExportDto.java new file mode 100644 index 000000000..3e0a91ac6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValExportDto.java @@ -0,0 +1,43 @@ +package com.jero.modules.split.dto; + +import com.jero.modules.split.entity.SarFileSplitItemsTableEO; + +import java.util.List; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/2/14 9:18 + */ +public class FileSplitValExportDto { + + private String valType; + + private String valContent; + + private List tableEOList; + + public String getValType() { + return valType; + } + + public void setValType(String valType) { + this.valType = valType; + } + + public String getValContent() { + return valContent; + } + + public void setValContent(String valContent) { + this.valContent = valContent; + } + + public List getTableEOList() { + return tableEOList; + } + + public void setTableEOList(List tableEOList) { + this.tableEOList = tableEOList; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValImgExportDto.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValImgExportDto.java new file mode 100644 index 000000000..1eec6adb4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValImgExportDto.java @@ -0,0 +1,29 @@ +package com.jero.modules.split.dto; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/2/14 15:58 + */ +public class FileSplitValImgExportDto { + + private String imgName; + + private String imgPath; + + public String getImgName() { + return imgName; + } + + public void setImgName(String imgName) { + this.imgName = imgName; + } + + public String getImgPath() { + return imgPath; + } + + public void setImgPath(String imgPath) { + this.imgPath = imgPath; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/SarFileSplitItemsImportDto.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/SarFileSplitItemsImportDto.java new file mode 100644 index 000000000..2f0d32854 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/SarFileSplitItemsImportDto.java @@ -0,0 +1,132 @@ +package com.jero.modules.split.dto; + +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.util.Date; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/5/9 14:40 + */ +public class SarFileSplitItemsImportDto { + @Excel(name = "条款号", orderNum = "1") + private String itemsNum; + + @Excel(name = "条款名称", orderNum = "1") + private String itemsName; + + @Excel(name = "条款内容", orderNum = "1") + private String itermsConditions; + + @Excel(name = "新车型实施日期", orderNum = "1") + private Date newcarPutTime; + + @Excel(name = "在产车实施日期", orderNum = "1") + private Date productPutTime; + + @Excel(name = "关联零部件", orderNum = "1") + private String svpps; + + @Excel(name = "适用车型", orderNum = "1") + private String applyArctic; + + @Excel(name = "引用标准", orderNum = "1") + private String referenceStand; + + @Excel(name = "备注", orderNum = "1") + private String remarks; + + @Excel(name = "关联文件", orderNum = "1") + private String relevanceFile; + + private String relevanceFileName; + + public String getItemsNum() { + return itemsNum; + } + + public void setItemsNum(String itemsNum) { + this.itemsNum = itemsNum; + } + + public String getItemsName() { + return itemsName; + } + + public void setItemsName(String itemsName) { + this.itemsName = itemsName; + } + + public String getItermsConditions() { + return itermsConditions; + } + + public void setItermsConditions(String itermsConditions) { + this.itermsConditions = itermsConditions; + } + + public String getRelevanceFile() { + return relevanceFile; + } + + public void setRelevanceFile(String relevanceFile) { + this.relevanceFile = relevanceFile; + } + + public Date getNewcarPutTime() { + return newcarPutTime; + } + + public void setNewcarPutTime(Date newcarPutTime) { + this.newcarPutTime = newcarPutTime; + } + + public Date getProductPutTime() { + return productPutTime; + } + + public void setProductPutTime(Date productPutTime) { + this.productPutTime = productPutTime; + } + + public String getSvpps() { + return svpps; + } + + public void setSvpps(String svpps) { + this.svpps = svpps; + } + + public String getApplyArctic() { + return applyArctic; + } + + public void setApplyArctic(String applyArctic) { + this.applyArctic = applyArctic; + } + + public String getReferenceStand() { + return referenceStand; + } + + public void setReferenceStand(String referenceStand) { + this.referenceStand = referenceStand; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getRelevanceFileName() { + return relevanceFileName; + } + + public void setRelevanceFileName(String relevanceFileName) { + this.relevanceFileName = relevanceFileName; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/DrageMenuEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/DrageMenuEO.java new file mode 100644 index 000000000..d95626504 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/DrageMenuEO.java @@ -0,0 +1,85 @@ +package com.jero.modules.split.entity; + +/** + * 功能：MSG_BROWSE_INFO MsgBrowseInfoEOEntity
+ * 作者：code generator
+ * 日期： 2018-09-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class DrageMenuEO{ + + private String menuId; + private String menuParentId; + private Long menuDisplay; + private String targetMenuId; + private String targetParentId; + private Long targetMenuDisplay; + private String infoId; + private String moveType; + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getMenuParentId() { + return menuParentId; + } + + public void setMenuParentId(String menuParentId) { + this.menuParentId = menuParentId; + } + + + + public String getTargetMenuId() { + return targetMenuId; + } + + public void setTargetMenuId(String targetMenuId) { + this.targetMenuId = targetMenuId; + } + + public String getTargetParentId() { + return targetParentId; + } + + public void setTargetParentId(String targetParentId) { + this.targetParentId = targetParentId; + } + + public Long getMenuDisplay() { + return menuDisplay; + } + + public void setMenuDisplay(Long menuDisplay) { + this.menuDisplay = menuDisplay; + } + + public Long getTargetMenuDisplay() { + return targetMenuDisplay; + } + + public void setTargetMenuDisplay(Long targetMenuDisplay) { + this.targetMenuDisplay = targetMenuDisplay; + } + + public String getInfoId() { + return infoId; + } + + public void setInfoId(String infoId) { + this.infoId = infoId; + } + + public String getMoveType() { + return moveType; + } + + public void setMoveType(String moveType) { + this.moveType = moveType; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java new file mode 100644 index 000000000..daa359ebb --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java @@ -0,0 +1,416 @@ +package com.jero.modules.split.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEOEntity
+ * 作者：code generator
+ * 日期： 2020-01-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class SarFileSplitItemsEO implements Serializable { + private static final long serialVersionUID = 1L; + + private String id; + private String infoId; + private String itemsNum; + private String itemsName; + private String itermsConditions; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date newcarPutTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date productPutTime; + private String menuId; + private String svpps; + private String applyArctic; + private String referenceStand; + private String specialRequest; + private String relevanceFile; + private String remarks; + private Integer validFlag; + private String creationUser; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + private String modifyUser; + private String[] infoIdList; + private String[] idList; + private List itemValEOList; + // 前台删除的VAL表条目内容ID + private String delItemIds; + private String sMenuId; + //特殊参数要求 + private List paramsList; + private String relevanceFileAttid; + private String issForce; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
+ *

字段列表：

+ *
  • id -> id
    • + *
  • infoId -> info_id
    • + *
  • itemsNum -> items_num
    • + *
  • itemsName -> items_name
    • + *
  • itermsConditions -> iterms_conditions
    • + *
  • newcarPutTime -> newcar_put_time
    • + *
  • productPutTime -> product_put_time
    • + *
  • menuId -> menu_id
    • + *
  • svpps -> svpps
    • + *
  • applyArctic -> apply_arctic
    • + *
  • referenceStand -> reference_stand
    • + *
  • specialRequest -> special_request
    • + *
  • relevanceFile -> relevance_file
    • + *
  • remarks -> remarks
    • + *
  • validFlag -> valid_flag
    • + *
  • creationUser -> creation_user
    • + *
  • creationTime -> creation_time
    • + *
  • modifyTime -> modify_time
    • + *
  • modifyUser -> modify_user
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "id": return "id"; + case "infoId": return "info_id"; + case "itemsNum": return "items_num"; + case "itemsName": return "items_name"; + case "itermsConditions": return "iterms_conditions"; + case "newcarPutTime": return "newcar_put_time"; + case "productPutTime": return "product_put_time"; + case "menuId": return "menu_id"; + case "svpps": return "svpps"; + case "applyArctic": return "apply_arctic"; + case "referenceStand": return "reference_stand"; + case "specialRequest": return "special_request"; + case "relevanceFile": return "relevance_file"; + case "remarks": return "remarks"; + case "validFlag": return "valid_flag"; + case "creationUser": return "creation_user"; + case "creationTime": return "creation_time"; + case "modifyTime": return "modify_time"; + case "modifyUser": return "modify_user"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • info_id -> infoId
    • + *
  • items_num -> itemsNum
    • + *
  • items_name -> itemsName
    • + *
  • iterms_conditions -> itermsConditions
    • + *
  • newcar_put_time -> newcarPutTime
    • + *
  • product_put_time -> productPutTime
    • + *
  • menu_id -> menuId
    • + *
  • svpps -> svpps
    • + *
  • apply_arctic -> applyArctic
    • + *
  • reference_stand -> referenceStand
    • + *
  • special_request -> specialRequest
    • + *
  • relevance_file -> relevanceFile
    • + *
  • remarks -> remarks
    • + *
  • valid_flag -> validFlag
    • + *
  • creation_user -> creationUser
    • + *
  • creation_time -> creationTime
    • + *
  • modify_time -> modifyTime
    • + *
  • modify_user -> modifyUser
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "id": return "id"; + case "info_id": return "infoId"; + case "items_num": return "itemsNum"; + case "items_name": return "itemsName"; + case "iterms_conditions": return "itermsConditions"; + case "newcar_put_time": return "newcarPutTime"; + case "product_put_time": return "productPutTime"; + case "menu_id": return "menuId"; + case "svpps": return "svpps"; + case "apply_arctic": return "applyArctic"; + case "reference_stand": return "referenceStand"; + case "special_request": return "specialRequest"; + case "relevance_file": return "relevanceFile"; + case "remarks": return "remarks"; + case "valid_flag": return "validFlag"; + case "creation_user": return "creationUser"; + case "creation_time": return "creationTime"; + case "modify_time": return "modifyTime"; + case "modify_user": return "modifyUser"; + default: return null; + } + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getInfoId() { + return this.infoId; + } + + /** **/ + public void setInfoId(String infoId) { + this.infoId = infoId; + } + + /** **/ + public String getItemsNum() { + return this.itemsNum; + } + + /** **/ + public void setItemsNum(String itemsNum) { + this.itemsNum = itemsNum; + } + + /** **/ + public String getItemsName() { + return this.itemsName; + } + + /** **/ + public void setItemsName(String itemsName) { + this.itemsName = itemsName; + } + + public String getItermsConditions() { + return itermsConditions; + } + + public void setItermsConditions(String itermsConditions) { + this.itermsConditions = itermsConditions; + } + + /** **/ + public Date getNewcarPutTime() { + return this.newcarPutTime; + } + + /** **/ + public void setNewcarPutTime(Date newcarPutTime) { + this.newcarPutTime = newcarPutTime; + } + + /** **/ + public Date getProductPutTime() { + return this.productPutTime; + } + + /** **/ + public void setProductPutTime(Date productPutTime) { + this.productPutTime = productPutTime; + } + + /** **/ + public String getMenuId() { + return this.menuId; + } + + /** **/ + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + /** **/ + public String getSvpps() { + return this.svpps; + } + + /** **/ + public void setSvpps(String svpps) { + this.svpps = svpps; + } + + /** **/ + public String getApplyArctic() { + return this.applyArctic; + } + + /** **/ + public void setApplyArctic(String applyArctic) { + this.applyArctic = applyArctic; + } + + /** **/ + public String getReferenceStand() { + return this.referenceStand; + } + + /** **/ + public void setReferenceStand(String referenceStand) { + this.referenceStand = referenceStand; + } + + /** **/ + public String getSpecialRequest() { + return this.specialRequest; + } + + /** **/ + public void setSpecialRequest(String specialRequest) { + this.specialRequest = specialRequest; + } + + /** **/ + public String getRelevanceFile() { + return this.relevanceFile; + } + + /** **/ + public void setRelevanceFile(String relevanceFile) { + this.relevanceFile = relevanceFile; + } + + /** **/ + public String getRemarks() { + return this.remarks; + } + + /** **/ + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public String getCreationUser() { + return this.creationUser; + } + + /** **/ + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public String getModifyUser() { + return this.modifyUser; + } + + /** **/ + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + + List itemsCondi; + + public List getItemsCondi() { + return itemsCondi; + } + + public void setItemsCondi(List itemsCondi) { + this.itemsCondi = itemsCondi; + } + + public String[] getInfoIdList() { + return infoIdList; + } + + public void setInfoIdList(String[] infoIdList) { + this.infoIdList = infoIdList; + } + + public String[] getIdList() { + return idList; + } + + public void setIdList(String[] idList) { + this.idList = idList; + } + + public List getItemValEOList() { + return itemValEOList; + } + + public void setItemValEOList(List itemValEOList) { + this.itemValEOList = itemValEOList; + } + + public String getDelItemIds() { + return delItemIds; + } + + public void setDelItemIds(String delItemIds) { + this.delItemIds = delItemIds; + } + + public String getsMenuId() { + return sMenuId; + } + + public void setsMenuId(String sMenuId) { + this.sMenuId = sMenuId; + } + + public List getParamsList() { + return paramsList; + } + + public void setParamsList(List paramsList) { + this.paramsList = paramsList; + } + + public String getRelevanceFileAttid() { + return relevanceFileAttid; + } + + public void setRelevanceFileAttid(String relevanceFileAttid) { + this.relevanceFileAttid = relevanceFileAttid; + } + + public String getIssForce() { + return issForce; + } + + public void setIssForce(String issForce) { + this.issForce = issForce; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsFileEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsFileEO.java new file mode 100644 index 000000000..6d838eb2e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsFileEO.java @@ -0,0 +1,194 @@ +package com.jero.modules.split.entity; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_FILE SarFileSplitItemsFileEOEntity
    + * 作者：code generator
    + * 日期： 2020-03-30
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsFileEO implements Serializable { + private static final long serialVersionUID = 1L; + + private String id; + private String standId; + private String resId; + private String attId; + private String useModel; + private Integer validFlag; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + private Long pageCount; + private List idlist = new ArrayList<>(); + private String fileOldName; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • standId -> stand_id
    • + *
  • resId -> res_id
    • + *
  • attId -> att_id
    • + *
  • useModel -> use_model
    • + *
  • validFlag -> valid_flag
    • + *
  • creationTime -> creation_time
    • + *
  • modifyTime -> modify_time
    • + *
  • pageCount -> page_count
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "id": return "id"; + case "standId": return "stand_id"; + case "resId": return "res_id"; + case "attId": return "att_id"; + case "useModel": return "use_model"; + case "validFlag": return "valid_flag"; + case "creationTime": return "creation_time"; + case "modifyTime": return "modify_time"; + case "pageCount": return "page_count"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • stand_id -> standId
    • + *
  • res_id -> resId
    • + *
  • att_id -> attId
    • + *
  • use_model -> useModel
    • + *
  • valid_flag -> validFlag
    • + *
  • creation_time -> creationTime
    • + *
  • modify_time -> modifyTime
    • + *
  • page_count -> pageCount
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "id": return "id"; + case "stand_id": return "standId"; + case "res_id": return "resId"; + case "att_id": return "attId"; + case "use_model": return "useModel"; + case "valid_flag": return "validFlag"; + case "creation_time": return "creationTime"; + case "modify_time": return "modifyTime"; + case "page_count": return "pageCount"; + default: return null; + } + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getStandId() { + return this.standId; + } + + /** **/ + public void setStandId(String standId) { + this.standId = standId; + } + + /** **/ + public String getResId() { + return this.resId; + } + + /** **/ + public void setResId(String resId) { + this.resId = resId; + } + + /** **/ + public String getAttId() { + return this.attId; + } + + /** **/ + public void setAttId(String attId) { + this.attId = attId; + } + + /** **/ + public String getUseModel() { + return this.useModel; + } + + /** **/ + public void setUseModel(String useModel) { + this.useModel = useModel; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Long getPageCount() { + return this.pageCount; + } + + /** **/ + public void setPageCount(Long pageCount) { + this.pageCount = pageCount; + } + + public List getIdlist() { + return idlist; + } + + public void setIdlist(List idlist) { + this.idlist = idlist; + } + + public String getFileOldName() { + return fileOldName; + } + + public void setFileOldName(String fileOldName) { + this.fileOldName = fileOldName; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsParamsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsParamsEO.java new file mode 100644 index 000000000..9e8641a46 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsParamsEO.java @@ -0,0 +1,160 @@ +package com.jero.modules.split.entity; + +import java.io.Serializable; +import java.util.Date; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOEntity
    + * 作者：code generator
    + * 日期： 2020-02-04
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsParamsEO implements Serializable { + private static final long serialVersionUID = 1L; + + private String id; + private String itemId; + private String description; + private String figure; + private Integer validFlag; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + private String infoId; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • itemId -> item_id
    • + *
  • description -> description
    • + *
  • figure -> figure
    • + *
  • validFlag -> valid_flag
    • + *
  • creationTime -> creation_time
    • + *
  • modifyTime -> modify_time
    • + *
  • infoId -> info_id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "id": return "id"; + case "itemId": return "item_id"; + case "description": return "description"; + case "figure": return "figure"; + case "validFlag": return "valid_flag"; + case "creationTime": return "creation_time"; + case "modifyTime": return "modify_time"; + case "infoId": return "info_id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • item_id -> itemId
    • + *
  • description -> description
    • + *
  • figure -> figure
    • + *
  • valid_flag -> validFlag
    • + *
  • creation_time -> creationTime
    • + *
  • modify_time -> modifyTime
    • + *
  • info_id -> infoId
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "id": return "id"; + case "item_id": return "itemId"; + case "description": return "description"; + case "figure": return "figure"; + case "valid_flag": return "validFlag"; + case "creation_time": return "creationTime"; + case "modify_time": return "modifyTime"; + case "info_id": return "infoId"; + default: return null; + } + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getItemId() { + return this.itemId; + } + + /** **/ + public void setItemId(String itemId) { + this.itemId = itemId; + } + + /** **/ + public String getDescription() { + return this.description; + } + + /** **/ + public void setDescription(String description) { + this.description = description; + } + + /** **/ + public String getFigure() { + return this.figure; + } + + /** **/ + public void setFigure(String figure) { + this.figure = figure; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public String getInfoId() { + return this.infoId; + } + + /** **/ + public void setInfoId(String infoId) { + this.infoId = infoId; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsResEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsResEO.java new file mode 100644 index 000000000..fbb6a056e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsResEO.java @@ -0,0 +1,171 @@ +package com.jero.modules.split.entity; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_RES SarFileSplitItemsResEOEntity
    + * 作者：code generator
    + * 日期： 2020-03-30
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsResEO implements Serializable { + private static final long serialVersionUID = 1L; + + private String id; + private String standId; + private String standFileClassify; + private String fileName; + private String fileSuffix; + private Integer validFlag; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + private List idlist = new ArrayList<>(); + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • standId -> stand_id
    • + *
  • standFileClassify -> stand_file_classify
    • + *
  • fileName -> file_name
    • + *
  • fileSuffix -> file_suffix
    • + *
  • validFlag -> valid_flag
    • + *
  • creationTime -> creation_time
    • + *
  • modifyTime -> modify_time
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "id": return "id"; + case "standId": return "stand_id"; + case "standFileClassify": return "stand_file_classify"; + case "fileName": return "file_name"; + case "fileSuffix": return "file_suffix"; + case "validFlag": return "valid_flag"; + case "creationTime": return "creation_time"; + case "modifyTime": return "modify_time"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • stand_id -> standId
    • + *
  • stand_file_classify -> standFileClassify
    • + *
  • file_name -> fileName
    • + *
  • file_suffix -> fileSuffix
    • + *
  • valid_flag -> validFlag
    • + *
  • creation_time -> creationTime
    • + *
  • modify_time -> modifyTime
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "id": return "id"; + case "stand_id": return "standId"; + case "stand_file_classify": return "standFileClassify"; + case "file_name": return "fileName"; + case "file_suffix": return "fileSuffix"; + case "valid_flag": return "validFlag"; + case "creation_time": return "creationTime"; + case "modify_time": return "modifyTime"; + default: return null; + } + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getStandId() { + return this.standId; + } + + /** **/ + public void setStandId(String standId) { + this.standId = standId; + } + + /** **/ + public String getStandFileClassify() { + return this.standFileClassify; + } + + /** **/ + public void setStandFileClassify(String standFileClassify) { + this.standFileClassify = standFileClassify; + } + + /** **/ + public String getFileName() { + return this.fileName; + } + + /** **/ + public void setFileName(String fileName) { + this.fileName = fileName; + } + + /** **/ + public String getFileSuffix() { + return this.fileSuffix; + } + + /** **/ + public void setFileSuffix(String fileSuffix) { + this.fileSuffix = fileSuffix; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public List getIdlist() { + return idlist; + } + + public void setIdlist(List idlist) { + this.idlist = idlist; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsTableEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsTableEO.java new file mode 100644 index 000000000..0339e5ad7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsTableEO.java @@ -0,0 +1,190 @@ +package com.jero.modules.split.entity; + +import java.io.Serializable; +import java.util.Date; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEOEntity
    + * 作者：code generator
    + * 日期： 2020-01-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsTableEO implements Serializable { + private static final long serialVersionUID = 1L; + + private String id; + private String itemsValId; + private String itemsId; + private Integer rowNum; + private Integer colNum; + private String content; + private Integer validFlag; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + private String modifyUser; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • itemsValId -> items_val_id
    • + *
  • itemsId -> items_id
    • + *
  • rowNum -> row_num
    • + *
  • colNum -> col_num
    • + *
  • content -> content
    • + *
  • validFlag -> valid_flag
    • + *
  • creationTime -> creation_time
    • + *
  • modifyTime -> modify_time
    • + *
  • modifyUser -> modify_user
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "id": return "id"; + case "itemsValId": return "items_val_id"; + case "itemsId": return "items_id"; + case "rowNum": return "row_num"; + case "colNum": return "col_num"; + case "content": return "content"; + case "validFlag": return "valid_flag"; + case "creationTime": return "creation_time"; + case "modifyTime": return "modify_time"; + case "modifyUser": return "modify_user"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • items_val_id -> itemsValId
    • + *
  • items_id -> itemsId
    • + *
  • row_num -> rowNum
    • + *
  • col_num -> colNum
    • + *
  • content -> content
    • + *
  • valid_flag -> validFlag
    • + *
  • creation_time -> creationTime
    • + *
  • modify_time -> modifyTime
    • + *
  • modify_user -> modifyUser
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "id": return "id"; + case "items_val_id": return "itemsValId"; + case "items_id": return "itemsId"; + case "row_num": return "rowNum"; + case "col_num": return "colNum"; + case "content": return "content"; + case "valid_flag": return "validFlag"; + case "creation_time": return "creationTime"; + case "modify_time": return "modifyTime"; + case "modify_user": return "modifyUser"; + default: return null; + } + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getItemsValId() { + return this.itemsValId; + } + + /** **/ + public void setItemsValId(String itemsValId) { + this.itemsValId = itemsValId; + } + + /** **/ + public String getItemsId() { + return this.itemsId; + } + + /** **/ + public void setItemsId(String itemsId) { + this.itemsId = itemsId; + } + + /** **/ + public Integer getRowNum() { + return this.rowNum; + } + + /** **/ + public void setRowNum(Integer rowNum) { + this.rowNum = rowNum; + } + + /** **/ + public Integer getColNum() { + return this.colNum; + } + + /** **/ + public void setColNum(Integer colNum) { + this.colNum = colNum; + } + + /** **/ + public String getContent() { + return this.content; + } + + /** **/ + public void setContent(String content) { + this.content = content; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public String getModifyUser() { + return this.modifyUser; + } + + /** **/ + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java new file mode 100644 index 000000000..f7eb7d47c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java @@ -0,0 +1,255 @@ +package com.jero.modules.split.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.modules.split.common.UploadFileInfo; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_VAL SarFileSplitItemsValEOEntity
    + * 作者：code generator
    + * 日期： 2020-01-07
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsValEO implements Serializable { + private static final long serialVersionUID = 1L; + + private String id; + private String type; + private String itemId; + private String itemContent; + private Integer validFlag; + private String creationUser; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + private String modifyUser; + private Integer displaySeq; + private String[] idList; + private List defaultFileList; + private String imgName; + private Integer indexItem; + private List tableList; + private List> tableListShow; + private int rowCount; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • type -> type
    • + *
  • itemId -> item_id
    • + *
  • itemContent -> item_content
    • + *
  • validFlag -> valid_flag
    • + *
  • creationUser -> creation_user
    • + *
  • creationTime -> creation_time
    • + *
  • modifyTime -> modify_time
    • + *
  • modifyUser -> modify_user
    • + *
  • displaySeq -> display_seq
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "id": return "id"; + case "type": return "type"; + case "itemId": return "item_id"; + case "itemContent": return "item_content"; + case "validFlag": return "valid_flag"; + case "creationUser": return "creation_user"; + case "creationTime": return "creation_time"; + case "modifyTime": return "modify_time"; + case "modifyUser": return "modify_user"; + case "displaySeq": return "display_seq"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • type -> type
    • + *
  • item_id -> itemId
    • + *
  • item_content -> itemContent
    • + *
  • valid_flag -> validFlag
    • + *
  • creation_user -> creationUser
    • + *
  • creation_time -> creationTime
    • + *
  • modify_time -> modifyTime
    • + *
  • modify_user -> modifyUser
    • + *
  • display_seq -> displaySeq
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "id": return "id"; + case "type": return "type"; + case "item_id": return "itemId"; + case "item_content": return "itemContent"; + case "valid_flag": return "validFlag"; + case "creation_user": return "creationUser"; + case "creation_time": return "creationTime"; + case "modify_time": return "modifyTime"; + case "modify_user": return "modifyUser"; + case "display_seq": return "displaySeq"; + default: return null; + } + } + + public Integer getIndexItem() { + return indexItem; + } + + public void setIndexItem(Integer indexItem) { + this.indexItem = indexItem; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getType() { + return this.type; + } + + /** **/ + public void setType(String type) { + this.type = type; + } + + /** **/ + public String getItemId() { + return this.itemId; + } + + /** **/ + public void setItemId(String itemId) { + this.itemId = itemId; + } + + /** **/ + public String getItemContent() { + return itemContent; + } + + public void setItemContent(String itemContent) { + this.itemContent = itemContent; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public String getCreationUser() { + return this.creationUser; + } + + /** **/ + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public String getModifyUser() { + return this.modifyUser; + } + + /** **/ + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + /** **/ + public Integer getDisplaySeq() { + return this.displaySeq; + } + + /** **/ + public void setDisplaySeq(Integer displaySeq) { + this.displaySeq = displaySeq; + } + + public String[] getIdList() { + return idList; + } + + public void setIdList(String[] idList) { + this.idList = idList; + } + + public List getDefaultFileList() { + return defaultFileList; + } + + public void setDefaultFileList(List defaultFileList) { + this.defaultFileList = defaultFileList; + } + + public String getImgName() { + return imgName; + } + + public void setImgName(String imgName) { + this.imgName = imgName; + } + + public List getTableList() { + return tableList; + } + + public void setTableList(List tableList) { + this.tableList = tableList; + } + + public int getRowCount() { + return rowCount; + } + + public void setRowCount(int rowCount) { + this.rowCount = rowCount; + } + + public List> getTableListShow() { + return tableListShow; + } + + public void setTableListShow(List> tableListShow) { + this.tableListShow = tableListShow; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java new file mode 100644 index 000000000..b6a896a93 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java @@ -0,0 +1,306 @@ +package com.jero.modules.split.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.system.vo.LoginUser; +import org.apache.shiro.SecurityUtils; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 功能：SAR_FILE_SPLIT_MENU SarFileSplitMenuEOEntity
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitMenuEO implements Serializable { + private static final long serialVersionUID = 1L; + + private String id; + private String infoId; + private String name; + private String pId; + private Long displaySeq; + private Integer validFlag; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + private String remarks; + private String creationUser; + private String modifyUser; + private String itemName; + private String[] infoIdList; + + private Long displaySeqStart; + private Long displaySeqEnd; + private Long childrenCount; + + private List children = new ArrayList<>(); + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • infoId -> info_id
    • + *
  • name -> name
    • + *
  • pId -> p_id
    • + *
  • displaySeq -> display_seq
    • + *
  • validFlag -> valid_flag
    • + *
  • creationTime -> creation_time
    • + *
  • modifyTime -> modify_time
    • + *
  • remarks -> remarks
    • + *
  • creationUser -> creation_user
    • + *
  • modifyUser -> modify_user
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "id": return "id"; + case "infoId": return "info_id"; + case "name": return "name"; + case "pId": return "p_id"; + case "displaySeq": return "display_seq"; + case "validFlag": return "valid_flag"; + case "creationTime": return "creation_time"; + case "modifyTime": return "modify_time"; + case "remarks": return "remarks"; + case "creationUser": return "creation_user"; + case "modifyUser": return "modify_user"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • info_id -> infoId
    • + *
  • name -> name
    • + *
  • p_id -> pId
    • + *
  • display_seq -> displaySeq
    • + *
  • valid_flag -> validFlag
    • + *
  • creation_time -> creationTime
    • + *
  • modify_time -> modifyTime
    • + *
  • remarks -> remarks
    • + *
  • creation_user -> creationUser
    • + *
  • modify_user -> modifyUser
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "id": return "id"; + case "info_id": return "infoId"; + case "name": return "name"; + case "p_id": return "pId"; + case "display_seq": return "displaySeq"; + case "valid_flag": return "validFlag"; + case "creation_time": return "creationTime"; + case "modify_time": return "modifyTime"; + case "remarks": return "remarks"; + case "creation_user": return "creationUser"; + case "modify_user": return "modifyUser"; + default: return null; + } + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getInfoId() { + return this.infoId; + } + + /** **/ + public void setInfoId(String infoId) { + this.infoId = infoId; + } + + /** **/ + public String getName() { + return this.name; + } + + /** **/ + public void setName(String name) { + this.name = name; + } + + /** **/ + public String getPId() { + return this.pId; + } + + /** **/ + public void setPId(String pId) { + this.pId = pId; + } + + /** **/ + public Long getDisplaySeq() { + return this.displaySeq; + } + + /** **/ + public void setDisplaySeq(Long displaySeq) { + this.displaySeq = displaySeq; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public String getRemarks() { + return this.remarks; + } + + /** **/ + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + /** **/ + public String getCreationUser() { + return this.creationUser; + } + + /** **/ + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + /** **/ + public String getModifyUser() { + return this.modifyUser; + } + + /** **/ + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } + + + public String[] getInfoIdList() { + return infoIdList; + } + + public void setInfoIdList(String[] infoIdList) { + this.infoIdList = infoIdList; + } + + public SarFileSplitMenuEO(){ + } + + public SarFileSplitMenuEO(String id, String name, String parentId, String infoId, Long displaySeq,String itemName) { + this.id = id; + this.name = name; + this.pId = parentId; + this.infoId = infoId; + this.displaySeq = displaySeq; + this.validFlag = 0; + this.creationTime = new Date(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + this.creationUser = sysUser.getId(); + this.modifyTime = new Date(); + this.modifyUser = sysUser.getId(); + this.itemName = itemName; + } + + public SarFileSplitMenuEO(String id, String name, String infoId,Long displaySeq,String itemName) { + this.id = id; + this.name = name; + this.infoId = infoId; + this.displaySeq = displaySeq; + this.validFlag = 0; + this.creationTime = new Date(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + this.creationUser = sysUser.getId(); + this.modifyTime = new Date(); + this.modifyUser = sysUser.getId(); + this.itemName = itemName; + } + + public Long getDisplaySeqStart() { + return displaySeqStart; + } + + public void setDisplaySeqStart(Long displaySeqStart) { + this.displaySeqStart = displaySeqStart; + } + + public Long getDisplaySeqEnd() { + return displaySeqEnd; + } + + public void setDisplaySeqEnd(Long displaySeqEnd) { + this.displaySeqEnd = displaySeqEnd; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public Long getChildrenCount() { + return childrenCount; + } + + public void setChildrenCount(Long childrenCount) { + this.childrenCount = childrenCount; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeModel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeModel.java new file mode 100644 index 000000000..fa5f44b73 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeModel.java @@ -0,0 +1,84 @@ +package com.jero.modules.split.entity; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * 标准拆分，存储树形结构实体。 + */ +public class SarFileSplitMenuTreeModel implements Serializable { + + private static final long serialVersionUID = 1L; + private String id; + private String parendId; + private String itemNum; + private String itemName; + private String itermsConditions; + private String name; + + private List children = new ArrayList<>(); + + public SarFileSplitMenuTreeModel() { + } + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getParendId() { + return parendId; + } + + public void setParendId(String parendId) { + this.parendId = parendId; + } + + public String getItemNum() { + return itemNum; + } + + public void setItemNum(String itemNum) { + this.itemNum = itemNum; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getItermsConditions() { + return itermsConditions; + } + + public void setItermsConditions(String itermsConditions) { + this.itermsConditions = itermsConditions; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeNode.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeNode.java new file mode 100644 index 000000000..8291f4db2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeNode.java @@ -0,0 +1,14 @@ +package com.jero.modules.split.entity; + +import lombok.Data; + +@Data +public class SarFileSplitMenuTreeNode { + private String id; + private String name; + private String parentId; + private String parentName; + private Long orderNum; + private String itemName; + private String itemId; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/enums/StandFileClassifyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/enums/StandFileClassifyEnum.java new file mode 100644 index 000000000..3ae51b5ad --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/enums/StandFileClassifyEnum.java @@ -0,0 +1,44 @@ +package com.jero.modules.split.enums; + +/** + * 资源库文件分类枚举设置 + * @author gaoyan + * date 2018/09/03 + */ +public enum StandFileClassifyEnum { + + STAND_FILE("STAND_FILE","标准文本/法规文件"),STAND_MODIFY_FILE("STAND_MODIFY_FILE","标准译文"), + DRAFT_FILE("DRAFT_FILE","草案文件"),OPINION_FILE("OPINION_FILE","解读报告"), + SENT_SCREEN_FILE("SENT_SCREEN_FILE","送审稿"), REPORT_FILE("REPORT_FILE","报批稿"), + RELEVANCE_FILE("RELEVANCE_FILE","关联文件"),LAWS_FILE("LAWS_FILE","法规文件"), + RELEVANT_FILE("RELEVANT_FILE","相关附件") + ; + + private String value; + private String lable; + + private StandFileClassifyEnum(String value, String lable) { + this.value = value; + this.lable = lable; + } + public String getValue() { + return value; + } + public String getLable() { + return lable; + } + + + public static StandFileClassifyEnum getLableByValue(String value){ + StandFileClassifyEnum[] values = values(); + for (StandFileClassifyEnum standFileClassifyEnum : values) { + if(standFileClassifyEnum.getValue().equals(value)){ + return standFileClassifyEnum ; + } + } + return null; + } + + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/enums/UseModuleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/enums/UseModuleEnum.java new file mode 100644 index 000000000..ba0ca125e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/enums/UseModuleEnum.java @@ -0,0 +1,26 @@ +package com.jero.modules.split.enums; + +/** + * 标准库参数类型枚举设置 + * @author gaoyan + * date 2018/09/03 + */ +public enum UseModuleEnum { + + SOURCE_FILE("SOURCE_FILE","源文件"),WEB_FILE("WEB_FILE","PC预览文件"),MOBLE_FILE("MOBLE_FILE","手机预览文件"); + + private String value; + private String lable; + + private UseModuleEnum(String value, String lable) { + this.value = value; + this.lable = lable; + } + public String getValue() { + return value; + } + public String getLable() { + return lable; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/enums/ValueStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/enums/ValueStateEnum.java new file mode 100644 index 000000000..d0a1c10c4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/enums/ValueStateEnum.java @@ -0,0 +1,28 @@ +package com.jero.modules.split.enums; + +public enum ValueStateEnum { + + VALUE_TRUE(0,"TRUE"),VALUE_FALSE(1,"FALSE"); + + private int value; + private String lable; + + + private ValueStateEnum(int value, String lable) { + this.value = value; + this.lable = lable; + } + + + public int getValue() { + return value; + } + + + public String getLable() { + return lable; + } + + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsEOMapper.java new file mode 100644 index 000000000..feb630cf8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsEOMapper.java @@ -0,0 +1,57 @@ +package com.jero.modules.split.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.split.dto.FileSplitItemsExportDto; +import com.jero.modules.split.entity.SarFileSplitItemsEO; +import com.jero.modules.split.page.SarFileSplitItemsEOPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEODao
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface SarFileSplitItemsEOMapper extends BaseMapper { + + int insertForeach(List list); + + int deleteByIds(SarFileSplitItemsEO sarFileSplitItemsEO); + + int deleteByItemsIds(SarFileSplitItemsEO sarFileSplitItemsEO); + + int deleteByMenuIds(@Param("idList") List idList); + + int deleteByItemsIdList(@Param("idList") List idList); + + List queryItemsByMenuId(@Param("menuId") String menuId); + + List queryByItemsIds(@Param("idList") List idList); + + List queryByOrdersForExport(SarFileSplitItemsEOPage page); + + List queryByList2(SarFileSplitItemsEOPage page); + + + int insert(SarFileSplitItemsEO SarFileSplitItemsEO); + + int insertSelective(SarFileSplitItemsEO SarFileSplitItemsEO); + + int updateByPrimaryKey(SarFileSplitItemsEO SarFileSplitItemsEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsEO SarFileSplitItemsEO); + + SarFileSplitItemsEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsEOPage page); + + int queryByCount(SarFileSplitItemsEOPage page); + + List queryByPage(SarFileSplitItemsEOPage page); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsFileEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsFileEOMapper.java new file mode 100644 index 000000000..b823f1eb4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsFileEOMapper.java @@ -0,0 +1,46 @@ +package com.jero.modules.split.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.split.entity.SarFileSplitItemsFileEO; +import com.jero.modules.split.page.SarFileSplitItemsFileEOPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_FILE SarFileSplitItemsFileEODao
    + * 作者：code generator
    + * 日期： 2020-03-30
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface SarFileSplitItemsFileEOMapper extends BaseMapper { + + List selectFileByItemsIdAndId(SarFileSplitItemsFileEO sarStandFileEO); + + List selectFileMsgByAttId(String attId); + + List selectFileByAttId(String attId); + + int deleteByItemIds(@Param("idList") List idList); + + + int insert(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); + + int insertSelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); + + int updateByPrimaryKey(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); + + SarFileSplitItemsFileEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsFileEOPage page); + + int queryByCount(SarFileSplitItemsFileEOPage page); + + List queryByPage(SarFileSplitItemsFileEOPage page); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsParamsMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsParamsMapper.java new file mode 100644 index 000000000..38d7a5690 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsParamsMapper.java @@ -0,0 +1,47 @@ +package com.jero.modules.split.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.split.entity.SarFileSplitItemsParamsEO; +import com.jero.modules.split.page.SarFileSplitItemsParamsEOPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEODao
    + * 作者：code generator
    + * 日期： 2020-02-04
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface SarFileSplitItemsParamsMapper extends BaseMapper { + + int deleteByItemIds(@Param("idList") List idList); + + int deleteByInfoIds(@Param("idList") List idList); + + int insertForeach(List list); + + List queryItemsParamsByMenuId(@Param("idList") List idList); + + + int insert(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); + + int insertSelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); + + int updateByPrimaryKey(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); + + SarFileSplitItemsParamsEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsParamsEOPage page); + + int queryByCount(SarFileSplitItemsParamsEOPage page); + + List queryByPage(SarFileSplitItemsParamsEOPage page); + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsResEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsResEOMapper.java new file mode 100644 index 000000000..36433b9c9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsResEOMapper.java @@ -0,0 +1,42 @@ +package com.jero.modules.split.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.split.entity.SarFileSplitItemsResEO; +import com.jero.modules.split.page.SarFileSplitItemsResEOPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_RES SarFileSplitItemsResEODao
    + * 作者：code generator
    + * 日期： 2020-03-30
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface SarFileSplitItemsResEOMapper extends BaseMapper { + + List selectByItemsIdAndId(SarFileSplitItemsResEO stand); + + int deleteByItemIds(@Param("idList") List idList); + + int insert(SarFileSplitItemsResEO sarFileSplitItemsResEO); + + int insertSelective(SarFileSplitItemsResEO sarFileSplitItemsResEO); + + int updateByPrimaryKey(SarFileSplitItemsResEO sarFileSplitItemsResEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsResEO sarFileSplitItemsResEO); + + SarFileSplitItemsResEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsResEOPage page); + + int queryByCount(SarFileSplitItemsResEOPage page); + + List queryByPage(SarFileSplitItemsResEOPage page); + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsTableEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsTableEOMapper.java new file mode 100644 index 000000000..88ef871ff --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsTableEOMapper.java @@ -0,0 +1,50 @@ +package com.jero.modules.split.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.split.entity.SarFileSplitItemsTableEO; +import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEODao
    + * 作者：code generator
    + * 日期： 2020-01-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface SarFileSplitItemsTableEOMapper extends BaseMapper { + + int insertForeach(List list); + + List queryByRowNum(SarFileSplitItemsTableEOPage page); + + int deleteByitemValIds(@Param("idList") List idList); + + int deleteTableByMenuIds(@Param("idList") List idList); + + int deleteByitemIds(@Param("idList") List idList); + + List queryItemsTableByMenuId(@Param("idList") List idList); + + + int insert(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); + + int insertSelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); + + int updateByPrimaryKey(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); + + SarFileSplitItemsTableEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsTableEOPage page); + + int queryByCount(SarFileSplitItemsTableEOPage page); + + List queryByPage(SarFileSplitItemsTableEOPage page); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsValEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsValEOMapper.java new file mode 100644 index 000000000..f8be34150 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsValEOMapper.java @@ -0,0 +1,55 @@ +package com.jero.modules.split.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_VAL SarFileSplitItemsValEODao
    + * 作者：code generator
    + * 日期： 2020-01-07
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface SarFileSplitItemsValEOMapper extends BaseMapper { + + int deleteByIds(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + int deleteByitemId(String id); + + int insertForeach(List list); + + int updateForeach(List list); + + int deleteValByInfoIds(@Param("idList") List idList); + + int deleteValByitemIds(@Param("idList") List idList); + + int deleteValByMenuIds(@Param("idList") List idList); + + List queryItemsValByMenuId(@Param("idList") List idList); + + + int insert(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + int insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + int updateByPrimaryKey(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + SarFileSplitItemsValEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsValEOPage page); + + int queryByCount(SarFileSplitItemsValEOPage page); + + List queryByPage(SarFileSplitItemsValEOPage page); + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java new file mode 100644 index 000000000..34b887f17 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java @@ -0,0 +1,70 @@ +package com.jero.modules.split.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.split.entity.SarFileSplitMenuEO; +import com.jero.modules.split.page.SarFileSplitMenuEOPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_MENU SarFileSplitMenuEODao
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface SarFileSplitMenuEOMapper extends BaseMapper { + + int insertForeach(List list); + + int deleteByIds(SarFileSplitMenuEO sarFileSplitMenuEO); + + int updateDisplaySeqAdd(SarFileSplitMenuEO sarFileSplitMenuEO); + + int updateDisplaySeqCut(SarFileSplitMenuEO sarFileSplitMenuEO); + + List queryByPidExcpetSelf(SarFileSplitMenuEO sarFileSplitMenuEO); + + int deleteByPId(@Param("id") String id); + + int getMaxDisplayByid(@Param("id") String id); + + int getMaxDisplayByidNextLevel(@Param("id") String id); + + int getChildrenCountByParentId(@Param("id") String id); + + int updateChildrenDisplaySeqByIDAdd(SarFileSplitMenuEO childrenUpdateEO); + + int updateChildrenDisplaySeqByIDCut(SarFileSplitMenuEO childrenUpdateEO); + + /** + * 根据ID查询所有的子节点包括父节点 + * @param sarFileSplitMenuEO + * @return + */ + List queryAllChildrenByid(SarFileSplitMenuEO sarFileSplitMenuEO); + + int deleteByIdList(@Param("idList") List idList); + + + + int insert(SarFileSplitMenuEO sarFileSplitMenuEO); + + int insertSelective(SarFileSplitMenuEO sarFileSplitMenuEO); + + int updateByPrimaryKey(SarFileSplitMenuEO sarFileSplitMenuEO); + + int updateByPrimaryKeySelective(SarFileSplitMenuEO sarFileSplitMenuEO); + + SarFileSplitMenuEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitMenuEOPage page); + + int queryByCount(SarFileSplitMenuEOPage page); + + List queryByPage(SarFileSplitMenuEOPage page); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsEOMapper.xml new file mode 100644 index 000000000..c7b567388 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsEOMapper.xml @@ -0,0 +1,455 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SAR_FILE_SPLIT_ITEMS.id, SAR_FILE_SPLIT_ITEMS.info_id, SAR_FILE_SPLIT_ITEMS.items_num, items_name, iterms_conditions, newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file, SAR_FILE_SPLIT_ITEMS.remarks, SAR_FILE_SPLIT_ITEMS.valid_flag, SAR_FILE_SPLIT_ITEMS.creation_user, SAR_FILE_SPLIT_ITEMS.creation_time, SAR_FILE_SPLIT_ITEMS.modify_time, SAR_FILE_SPLIT_ITEMS.modify_user,SAR_FILE_SPLIT_ITEMS.iss_force + + + + + where 1=1 + + + and SAR_FILE_SPLIT_ITEMS.id ${idOperator} #{id} + + + and SAR_FILE_SPLIT_ITEMS.info_id ${infoIdOperator} #{infoId} + + + and SAR_FILE_SPLIT_ITEMS.items_num ${itemsNumOperator} #{itemsNum} + + + and SAR_FILE_SPLIT_ITEMS.items_name ${itemsNameOperator} #{itemsName} + + + and SAR_FILE_SPLIT_ITEMS.iterms_conditions ${itermsConditionsOperator} #{itermsConditions} + + + and SAR_FILE_SPLIT_ITEMS.newcar_put_time ${newcarPutTimeOperator} #{newcarPutTime} + + + and SAR_FILE_SPLIT_ITEMS.newcar_put_time >= #{newcarPutTime1} + + + and SAR_FILE_SPLIT_ITEMS.newcar_put_time <= #{newcarPutTime2} + + + and SAR_FILE_SPLIT_ITEMS.product_put_time ${productPutTimeOperator} #{productPutTime} + + + and SAR_FILE_SPLIT_ITEMS.product_put_time >= #{productPutTime1} + + + and SAR_FILE_SPLIT_ITEMS.product_put_time <= #{productPutTime2} + + + and menu_id = #{sMenuId} + + + and svpps ${svppsOperator} #{svpps} + + + and apply_arctic ${applyArcticOperator} #{applyArctic} + + + and reference_stand ${referenceStandOperator} #{referenceStand} + + + and special_request ${specialRequestOperator} #{specialRequest} + + + and relevance_file ${relevanceFileOperator} #{relevanceFile} + + + and SAR_FILE_SPLIT_ITEMS.remarks ${remarksOperator} #{remarks} + + + and SAR_FILE_SPLIT_ITEMS.valid_flag ${validFlagOperator} #{validFlag} + + + and SAR_FILE_SPLIT_ITEMS.creation_user ${creationUserOperator} #{creationUser} + + + and SAR_FILE_SPLIT_ITEMS.creation_time ${creationTimeOperator} #{creationTime} + + + and SAR_FILE_SPLIT_ITEMS.creation_time >= #{creationTime1} + + + and SAR_FILE_SPLIT_ITEMS.creation_time <= #{creationTime2} + + + and SAR_FILE_SPLIT_ITEMS.modify_time ${modifyTimeOperator} #{modifyTime} + + + and SAR_FILE_SPLIT_ITEMS.modify_time >= #{modifyTime1} + + + and SAR_FILE_SPLIT_ITEMS.modify_time <= #{modifyTime2} + + + and SAR_FILE_SPLIT_ITEMS.modify_user ${modifyUserOperator} #{modifyUser} + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS() + values (#{id, jdbcType=VARCHAR}, #{infoId, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itermsConditions, jdbcType=CLOB}, #{newcarPutTime, jdbcType=TIMESTAMP}, #{productPutTime, jdbcType=TIMESTAMP}, #{menuId, jdbcType=VARCHAR}, #{svpps, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{referenceStand, jdbcType=VARCHAR}, #{specialRequest, jdbcType=VARCHAR}, #{relevanceFile, jdbcType=VARCHAR}, #{remarks, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationUser, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}) + + + + + + insert into SAR_FILE_SPLIT_ITEMS + + id, + info_id, + items_num, + items_name, + iterms_conditions, + newcar_put_time, + product_put_time, + menu_id, + svpps, + apply_arctic, + reference_stand, + special_request, + relevance_file, + remarks, + valid_flag, + creation_user, + creation_time, + modify_time, + modify_user, + iss_force, + + + #{id, jdbcType=VARCHAR}, + #{infoId, jdbcType=VARCHAR}, + #{itemsNum, jdbcType=VARCHAR}, + #{itemsName, jdbcType=VARCHAR}, + #{itermsConditions, jdbcType=CLOB}, + #{newcarPutTime, jdbcType=TIMESTAMP}, + #{productPutTime, jdbcType=TIMESTAMP}, + #{menuId, jdbcType=VARCHAR}, + #{svpps, jdbcType=VARCHAR}, + #{applyArctic, jdbcType=VARCHAR}, + #{referenceStand, jdbcType=VARCHAR}, + #{specialRequest, jdbcType=VARCHAR}, + #{relevanceFile, jdbcType=VARCHAR}, + #{remarks, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationUser, jdbcType=VARCHAR}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{modifyUser, jdbcType=VARCHAR}, + #{issForce, jdbcType=INTEGER}, + + + + + + update SAR_FILE_SPLIT_ITEMS + set info_id = #{infoId}, + items_num = #{itemsNum}, + items_name = #{itemsName}, + iterms_conditions = #{itermsConditions}, + newcar_put_time = #{newcarPutTime}, + product_put_time = #{productPutTime}, + menu_id = #{menuId}, + svpps = #{svpps}, + apply_arctic = #{applyArctic}, + reference_stand = #{referenceStand}, + special_request = #{specialRequest}, + relevance_file = #{relevanceFile}, + remarks = #{remarks}, + valid_flag = #{validFlag}, + creation_user = #{creationUser}, + creation_time = #{creationTime}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser} + where id = #{id} + + + + + update SAR_FILE_SPLIT_ITEMS + + + info_id = #{infoId}, + + + items_num = #{itemsNum}, + + + items_name = #{itemsName}, + + + iterms_conditions = #{itermsConditions}, + + + newcar_put_time = #{newcarPutTime}, + + + newcar_put_time = null, + + + product_put_time = #{productPutTime}, + + + product_put_time = null, + + + menu_id = #{menuId}, + + + svpps = #{svpps}, + + + apply_arctic = #{applyArctic}, + + + reference_stand = #{referenceStand}, + + + special_request = #{specialRequest}, + + + relevance_file = #{relevanceFile}, + + + remarks = #{remarks}, + + + valid_flag = #{validFlag}, + + + creation_user = #{creationUser}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + modify_user = #{modifyUser}, + + + iss_force = #{issForce}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS + where id = #{value} + + + + + + + + + + + + + + + + + begin + + insert into SAR_FILE_SPLIT_ITEMS + (id, info_id, items_num, items_name, newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file, remarks, valid_flag, creation_user, creation_time, modify_time, + modify_user, iterms_conditions) + values ( + #{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR}, + #{item.itemsName, jdbcType=VARCHAR}, + #{item.newcarPutTime, jdbcType=TIMESTAMP}, #{item.productPutTime, jdbcType=TIMESTAMP}, + #{item.menuId, jdbcType=VARCHAR}, #{item.svpps, jdbcType=VARCHAR}, #{item.applyArctic, jdbcType=VARCHAR}, + #{item.referenceStand, jdbcType=VARCHAR}, #{item.specialRequest, jdbcType=VARCHAR}, + #{item.relevanceFile, jdbcType=VARCHAR}, #{item.remarks, jdbcType=VARCHAR}, + #{item.validFlag, jdbcType=INTEGER}, #{item.creationUser, jdbcType=VARCHAR}, + #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, + #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB} + ) + + ;end; + + + + delete from SAR_FILE_SPLIT_ITEMS + where info_id in + + #{item} + + + + + delete from SAR_FILE_SPLIT_ITEMS + where id in + + #{item} + + + + + delete from SAR_FILE_SPLIT_ITEMS + where menu_id in + + #{item} + + + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS + where id in + + #{item} + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsFileEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsFileEOMapper.xml new file mode 100644 index 000000000..85db52caa --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsFileEOMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + id, stand_id, res_id, att_id, use_model, valid_flag, creation_time, modify_time, page_count + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and stand_id ${standIdOperator} #{standId} + + + and res_id ${resIdOperator} #{resId} + + + and att_id ${attIdOperator} #{attId} + + + and use_model ${useModelOperator} #{useModel} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and page_count ${pageCountOperator} #{pageCount} + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS_FILE() + values (#{id, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{resId, jdbcType=VARCHAR}, #{attId, jdbcType=VARCHAR}, #{useModel, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{pageCount, jdbcType=VARCHAR}) + + + + + + insert into SAR_FILE_SPLIT_ITEMS_FILE + + id, + stand_id, + res_id, + att_id, + use_model, + valid_flag, + creation_time, + modify_time, + page_count, + + + #{id, jdbcType=VARCHAR}, + #{standId, jdbcType=VARCHAR}, + #{resId, jdbcType=VARCHAR}, + #{attId, jdbcType=VARCHAR}, + #{useModel, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{pageCount, jdbcType=VARCHAR}, + + + + + + update SAR_FILE_SPLIT_ITEMS_FILE + set stand_id = #{standId}, + res_id = #{resId}, + att_id = #{attId}, + use_model = #{useModel}, + valid_flag = #{validFlag}, + creation_time = #{creationTime}, + modify_time = #{modifyTime}, + page_count = #{pageCount} + where id = #{id} + + + + + update SAR_FILE_SPLIT_ITEMS_FILE + + + stand_id = #{standId}, + + + res_id = #{resId}, + + + att_id = #{attId}, + + + use_model = #{useModel}, + + + valid_flag = #{validFlag}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + page_count = #{pageCount}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_FILE + where id = #{value} + + + + + + + + + + + + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_FILE + where stand_id in + + #{item} + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsParamsMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsParamsMapper.xml new file mode 100644 index 000000000..ed7e0af27 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsParamsMapper.xml @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + id, item_id, description, figure, valid_flag, creation_time, modify_time, info_id + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and item_id ${itemIdOperator} #{itemId} + + + and description ${descriptionOperator} #{description} + + + and figure ${figureOperator} #{figure} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and info_id ${infoIdOperator} #{infoId} + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS_PARAMS() + values (#{id, jdbcType=VARCHAR}, #{itemId, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, #{figure, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{infoId, jdbcType=VARCHAR}) + + + + + + insert into SAR_FILE_SPLIT_ITEMS_PARAMS + + id, + item_id, + description, + figure, + valid_flag, + creation_time, + modify_time, + info_id, + + + #{id, jdbcType=VARCHAR}, + #{itemId, jdbcType=VARCHAR}, + #{description, jdbcType=VARCHAR}, + #{figure, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{infoId, jdbcType=VARCHAR}, + + + + + + update SAR_FILE_SPLIT_ITEMS_PARAMS + set item_id = #{itemId}, + description = #{description}, + figure = #{figure}, + valid_flag = #{validFlag}, + creation_time = #{creationTime}, + modify_time = #{modifyTime}, + info_id = #{infoId} + where id = #{id} + + + + + update SAR_FILE_SPLIT_ITEMS_PARAMS + + + item_id = #{itemId}, + + + description = #{description}, + + + figure = #{figure}, + + + valid_flag = #{validFlag}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + info_id = #{infoId}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_PARAMS + where id = #{value} + + + + + + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_PARAMS + where item_id in + + #{item} + + + + + begin + + insert into SAR_FILE_SPLIT_ITEMS_PARAMS() + values (#{item.id, jdbcType=VARCHAR}, #{item.itemId, jdbcType=VARCHAR}, #{item.description, jdbcType=VARCHAR}, #{item.figure, jdbcType=VARCHAR}, #{item.validFlag, jdbcType=INTEGER}, #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, #{item.infoId, jdbcType=VARCHAR}) + + ;end; + + + + delete from SAR_FILE_SPLIT_ITEMS_PARAMS + where info_id in + + #{item} + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsResEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsResEOMapper.xml new file mode 100644 index 000000000..6ba71e597 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsResEOMapper.xml @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + id, stand_id, stand_file_classify, file_name, file_suffix, valid_flag, creation_time, modify_time + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and stand_id ${standIdOperator} #{standId} + + + and stand_file_classify ${standFileClassifyOperator} #{standFileClassify} + + + and file_name ${fileNameOperator} #{fileName} + + + and file_suffix ${fileSuffixOperator} #{fileSuffix} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS_RES() + values (#{id, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{standFileClassify, jdbcType=VARCHAR}, #{fileName, jdbcType=VARCHAR}, #{fileSuffix, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}) + + + + + + insert into SAR_FILE_SPLIT_ITEMS_RES + + id, + stand_id, + stand_file_classify, + file_name, + file_suffix, + valid_flag, + creation_time, + modify_time, + + + #{id, jdbcType=VARCHAR}, + #{standId, jdbcType=VARCHAR}, + #{standFileClassify, jdbcType=VARCHAR}, + #{fileName, jdbcType=VARCHAR}, + #{fileSuffix, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + + + + + + update SAR_FILE_SPLIT_ITEMS_RES + set stand_id = #{standId}, + stand_file_classify = #{standFileClassify}, + file_name = #{fileName}, + file_suffix = #{fileSuffix}, + valid_flag = #{validFlag}, + creation_time = #{creationTime}, + modify_time = #{modifyTime} + where id = #{id} + + + + + update SAR_FILE_SPLIT_ITEMS_RES + + + stand_id = #{standId}, + + + stand_file_classify = #{standFileClassify}, + + + file_name = #{fileName}, + + + file_suffix = #{fileSuffix}, + + + valid_flag = #{validFlag}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_RES + where id = #{value} + + + + + + + + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_RES + where stand_id in + + #{item} + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsTableEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsTableEOMapper.xml new file mode 100644 index 000000000..6c4248727 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsTableEOMapper.xml @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + id, items_val_id, items_id, row_num, col_num, content, valid_flag, creation_time, modify_time, modify_user + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and items_val_id ${itemsValIdOperator} #{itemsValId} + + + and items_id ${itemsIdOperator} #{itemsId} + + + and row_num ${rowNumOperator} #{rowNum} + + + and col_num ${colNumOperator} #{colNum} + + + and content ${contentOperator} #{content} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and modify_user ${modifyUserOperator} #{modifyUser} + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS_TABLE() + values (#{id, jdbcType=VARCHAR}, #{itemsValId, jdbcType=VARCHAR}, #{itemsId, jdbcType=VARCHAR}, #{rowNum, jdbcType=INTEGER}, #{colNum, jdbcType=INTEGER}, #{content, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}) + + + + + + insert into SAR_FILE_SPLIT_ITEMS_TABLE + + id, + items_val_id, + items_id, + row_num, + col_num, + content, + valid_flag, + creation_time, + modify_time, + modify_user, + + + #{id, jdbcType=VARCHAR}, + #{itemsValId, jdbcType=VARCHAR}, + #{itemsId, jdbcType=VARCHAR}, + #{rowNum, jdbcType=INTEGER}, + #{colNum, jdbcType=INTEGER}, + #{content, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{modifyUser, jdbcType=VARCHAR}, + + + + + + update SAR_FILE_SPLIT_ITEMS_TABLE + set items_val_id = #{itemsValId}, + items_id = #{itemsId}, + row_num = #{rowNum}, + col_num = #{colNum}, + content = #{content}, + valid_flag = #{validFlag}, + creation_time = #{creationTime}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser} + where id = #{id} + + + + + update SAR_FILE_SPLIT_ITEMS_TABLE + + + items_val_id = #{itemsValId}, + + + items_id = #{itemsId}, + + + row_num = #{rowNum}, + + + col_num = #{colNum}, + + + content = #{content}, + + + valid_flag = #{validFlag}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + modify_user = #{modifyUser}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_TABLE + where id = #{value} + + + + + + + + + + + + + begin + + insert into SAR_FILE_SPLIT_ITEMS_TABLE() + values (#{item.id, jdbcType=VARCHAR}, #{item.itemsValId, jdbcType=VARCHAR}, + #{item.itemsId, jdbcType=VARCHAR}, #{item.rowNum, jdbcType=INTEGER}, #{item.colNum, jdbcType=INTEGER}, + #{item.content, jdbcType=VARCHAR}, #{item.validFlag, jdbcType=INTEGER}, #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, #{item.modifyUser, jdbcType=VARCHAR}) + + ;end; + + + + + + delete from SAR_FILE_SPLIT_ITEMS_TABLE + where ITEMS_VAL_ID in + + #{item} + + + + + delete from SAR_FILE_SPLIT_ITEMS_TABLE + where EXISTS ( + select 1 from SAR_FILE_SPLIT_ITEMS + where SAR_FILE_SPLIT_ITEMS_TABLE.ITEMS_ID=SAR_FILE_SPLIT_ITEMS.id + and SAR_FILE_SPLIT_ITEMS.MENU_ID in + + #{item} + + ) + + + + delete from SAR_FILE_SPLIT_ITEMS_TABLE + where ITEMS_ID in + + #{item} + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml new file mode 100644 index 000000000..237c58989 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + id, type, item_id, item_content, valid_flag, creation_user, creation_time, modify_time, modify_user, display_seq,img_name,index_item + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and type ${typeOperator} #{type} + + + and item_id ${itemIdOperator} #{itemId} + + + and item_content ${itemContentOperator} #{itemContent} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_user ${creationUserOperator} #{creationUser} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and modify_user ${modifyUserOperator} #{modifyUser} + + + and display_seq ${displaySeqOperator} #{displaySeq} + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS_VAL() + values (#{id, jdbcType=VARCHAR}, #{type, jdbcType=VARCHAR}, #{itemId, jdbcType=VARCHAR}, #{itemContent, jdbcType=CLOB}, #{validFlag, jdbcType=INTEGER}, #{creationUser, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{displaySeq, jdbcType=INTEGER}) + + + + + + insert into SAR_FILE_SPLIT_ITEMS_VAL + + id, + type, + item_id, + item_content, + valid_flag, + creation_user, + creation_time, + modify_time, + modify_user, + display_seq, + img_name, + index_item, + + + #{id, jdbcType=VARCHAR}, + #{type, jdbcType=VARCHAR}, + #{itemId, jdbcType=VARCHAR}, + #{itemContent, jdbcType=CLOB}, + #{validFlag, jdbcType=INTEGER}, + #{creationUser, jdbcType=VARCHAR}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{modifyUser, jdbcType=VARCHAR}, + #{displaySeq, jdbcType=INTEGER}, + #{imgName, jdbcType=VARCHAR}, + #{indexItem, jdbcType=INTEGER}, + + + + + + update SAR_FILE_SPLIT_ITEMS_VAL + set type = #{type}, + item_id = #{itemId}, + item_content = #{itemContent}, + valid_flag = #{validFlag}, + creation_user = #{creationUser}, + creation_time = #{creationTime}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser}, + display_seq = #{displaySeq} + where id = #{id} + + + + + update SAR_FILE_SPLIT_ITEMS_VAL + + + type = #{type}, + + + item_id = #{itemId}, + + + item_content = #{itemContent}, + + + valid_flag = #{validFlag}, + + + creation_user = #{creationUser}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + modify_user = #{modifyUser}, + + + display_seq = #{displaySeq}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where id = #{value} + + + + + + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where id in + + #{item} + + + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where item_id = #{value} + + + + + + begin + + insert into SAR_FILE_SPLIT_ITEMS_VAL + (id, type, item_id, valid_flag, creation_user, creation_time, modify_time, modify_user, display_seq, img_name, item_content, index_item) + values ( + #{item.id, jdbcType=VARCHAR}, #{item.type, jdbcType=VARCHAR}, + #{item.itemId, jdbcType=VARCHAR}, + #{item.validFlag, jdbcType=INTEGER}, #{item.creationUser, jdbcType=VARCHAR}, + #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, + #{item.modifyUser, jdbcType=VARCHAR}, #{item.displaySeq, jdbcType=INTEGER}, + #{item.imgName, jdbcType=INTEGER}, + #{item.itemContent, jdbcType=CLOB}, + #{item.indexItem, jdbcType=INTEGER}) + + ;end; + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where EXISTS ( + select 1 from SAR_FILE_SPLIT_ITEMS + where SAR_FILE_SPLIT_ITEMS_VAL.ITEM_ID=SAR_FILE_SPLIT_ITEMS.id + and SAR_FILE_SPLIT_ITEMS.INFO_ID in + + #{item} + + ) + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where ITEM_ID in + + #{item} + + + + + begin + + update SAR_FILE_SPLIT_ITEMS_VAL + + item_content = #{item.itemContent, jdbcType=VARCHAR}, + modify_time = #{item.modifyTime, jdbcType=TIMESTAMP}, + modify_user = #{item.modifyUser, jdbcType=VARCHAR}, + display_seq = #{item.displaySeq, jdbcType=INTEGER}, + index_item = #{item.indexItem, jdbcType=INTEGER}, + + where id = #{item.id, jdbcType=VARCHAR} + + ;end; + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where EXISTS ( + select 1 from SAR_FILE_SPLIT_ITEMS + where SAR_FILE_SPLIT_ITEMS_VAL.ITEM_ID=SAR_FILE_SPLIT_ITEMS.id + and SAR_FILE_SPLIT_ITEMS.MENU_ID in + + #{item} + + ) + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml new file mode 100644 index 000000000..74b82cfc7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + id, info_id, name, parent_id, display_seq, valid_flag, creation_time, modify_time, remarks, creation_user, modify_user,item_name + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and info_id ${infoIdOperator} #{infoId} + + + and name ${nameOperator} #{name} + + + and parent_id ${pIdOperator} #{pId} + + + and display_seq ${displaySeqOperator} #{displaySeq} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and remarks ${remarksOperator} #{remarks} + + + and creation_user ${creationUserOperator} #{creationUser} + + + and modify_user ${modifyUserOperator} #{modifyUser} + + + + + + + + insert into SAR_FILE_SPLIT_MENU() + values (#{id, jdbcType=VARCHAR}, #{infoId, jdbcType=VARCHAR}, #{name, jdbcType=VARCHAR}, #{pId, jdbcType=VARCHAR}, #{displaySeq, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{remarks, jdbcType=VARCHAR}, #{creationUser, jdbcType=VARCHAR}, #{modifyUser, jdbcType=VARCHAR}) + + + + + + insert into SAR_FILE_SPLIT_MENU + + id, + info_id, + name, + parent_id, + display_seq, + valid_flag, + creation_time, + modify_time, + remarks, + creation_user, + modify_user, + item_name, + + + #{id, jdbcType=VARCHAR}, + #{infoId, jdbcType=VARCHAR}, + #{name, jdbcType=VARCHAR}, + #{pId, jdbcType=VARCHAR}, + #{displaySeq, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{remarks, jdbcType=VARCHAR}, + #{creationUser, jdbcType=VARCHAR}, + #{modifyUser, jdbcType=VARCHAR}, + #{itemName, jdbcType=VARCHAR}, + + + + + + update SAR_FILE_SPLIT_MENU + set info_id = #{infoId}, + name = #{name}, + parent_id = #{pId}, + display_seq = #{displaySeq}, + valid_flag = #{validFlag}, + creation_time = #{creationTime}, + modify_time = #{modifyTime}, + remarks = #{remarks}, + creation_user = #{creationUser}, + modify_user = #{modifyUser} + where id = #{id} + + + + + update SAR_FILE_SPLIT_MENU + + + info_id = #{infoId}, + + + name = #{name}, + + + parent_id = #{pId}, + + + display_seq = #{displaySeq}, + + + valid_flag = #{validFlag}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + remarks = #{remarks}, + + + creation_user = #{creationUser}, + + + modify_user = #{modifyUser}, + + + item_name = #{itemName}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_MENU + where id = #{value} + + + + + + + + + + + + + + + insert into SAR_FILE_SPLIT_MENU() ( + + select + #{item.id, jdbcType=VARCHAR}, + #{item.infoId, jdbcType=VARCHAR}, + #{item.name, jdbcType=VARCHAR}, + #{item.pId, jdbcType=VARCHAR}, + #{item.displaySeq, jdbcType=VARCHAR}, + #{item.validFlag, jdbcType=INTEGER}, + #{item.creationTime, jdbcType=TIMESTAMP}, + #{item.modifyTime, jdbcType=TIMESTAMP}, #{item.remarks, jdbcType=VARCHAR}, + #{item.creationUser, jdbcType=VARCHAR}, #{item.modifyUser, jdbcType=VARCHAR} , #{item.itemName, jdbcType=VARCHAR} from dual + + ) + + + + delete from SAR_FILE_SPLIT_MENU + where info_id in + + #{item} + + + + + + update SAR_FILE_SPLIT_MENU + set display_seq = display_seq+#{childrenCount}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser} + where display_seq >= #{displaySeqStart} and display_seq < #{displaySeqEnd} and valid_flag = 0 and info_id = #{infoId} + + + + update SAR_FILE_SPLIT_MENU + set display_seq = display_seq-#{childrenCount}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser} + where display_seq <= #{displaySeqEnd} and display_seq > #{displaySeqStart} and valid_flag = 0 and info_id = #{infoId} + + + + + + delete from SAR_FILE_SPLIT_MENU where id in ( + select id from SAR_FILE_SPLIT_MENU start with id=#{id} connect by prior id= parent_id + ) + + + + + + + + + + + update SAR_FILE_SPLIT_MENU + set display_seq = display_seq + #{childrenCount}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser} + where id in ( SELECT id FROM + SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = parent_id) + + + + update SAR_FILE_SPLIT_MENU + set display_seq = display_seq - #{childrenCount}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser} + where id in ( SELECT id FROM + SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = parent_id) + + + + + + delete from SAR_FILE_SPLIT_MENU + where id in + + #{item} + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java new file mode 100644 index 000000000..cc715ffb8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java @@ -0,0 +1,303 @@ +package com.jero.modules.split.page; + +import com.jero.modules.split.common.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_INFO SarFileSplitInfoEOPage
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitInfoEOPage extends BasePage { + + private String sarType; + private String sarTypeOperator = "="; + private String fileName; + private String fileNameOperator = "="; + private String id; + private String idOperator = "="; + private String standId; + private String standIdOperator = "="; + private String fileType; + private String fileTypeOperator = "="; + private String attId; + private String attIdOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String modifyUser; + private String modifyUserOperator = "="; + + private String numOrName; + + private String standNumber; + private String fileSplitState; + private String standExecuteState; + private String[] idList; + private String userName; //姓名 + + public String getStandExecuteState() { + return standExecuteState; + } + + public void setStandExecuteState(String standExecuteState) { + this.standExecuteState = standExecuteState; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String[] getIdList() { + return idList; + } + + public void setIdList(String[] idList) { + this.idList = idList; + } + + public String getFileSplitState() { + return fileSplitState; + } + + public void setFileSplitState(String fileSplitState) { + this.fileSplitState = fileSplitState; + } + + public String getSarType() { + return this.sarType; + } + + public void setSarType(String sarType) { + this.sarType = sarType; + } + + public String getSarTypeOperator() { + return this.sarTypeOperator; + } + + public void setSarTypeOperator(String sarTypeOperator) { + this.sarTypeOperator = sarTypeOperator; + } + + public String getFileName() { + return this.fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNameOperator() { + return this.fileNameOperator; + } + + public void setFileNameOperator(String fileNameOperator) { + this.fileNameOperator = fileNameOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getStandId() { + return this.standId; + } + + public void setStandId(String standId) { + this.standId = standId; + } + + public String getStandIdOperator() { + return this.standIdOperator; + } + + public void setStandIdOperator(String standIdOperator) { + this.standIdOperator = standIdOperator; + } + + public String getFileType() { + return this.fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFileTypeOperator() { + return this.fileTypeOperator; + } + + public void setFileTypeOperator(String fileTypeOperator) { + this.fileTypeOperator = fileTypeOperator; + } + + public String getAttId() { + return this.attId; + } + + public void setAttId(String attId) { + this.attId = attId; + } + + public String getAttIdOperator() { + return this.attIdOperator; + } + + public void setAttIdOperator(String attIdOperator) { + this.attIdOperator = attIdOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getCreationUser() { + return this.creationUser; + } + + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + public String getCreationUserOperator() { + return this.creationUserOperator; + } + + public void setCreationUserOperator(String creationUserOperator) { + this.creationUserOperator = creationUserOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getModifyUser() { + return this.modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public String getModifyUserOperator() { + return this.modifyUserOperator; + } + + public void setModifyUserOperator(String modifyUserOperator) { + this.modifyUserOperator = modifyUserOperator; + } + + public String getNumOrName() { + return numOrName; + } + + public void setNumOrName(String numOrName) { + this.numOrName = numOrName; + } + + public String getStandNumber() { + return standNumber; + } + + public void setStandNumber(String standNumber) { + this.standNumber = standNumber; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java new file mode 100644 index 000000000..5896c6bb9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java @@ -0,0 +1,486 @@ +package com.jero.modules.split.page; + +import com.jero.modules.split.common.BasePage; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; + +import java.util.List; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEOPage
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String infoId; + private String infoIdOperator = "="; + private String itemsNum; + private String itemsNumOperator = "="; + private String itemsName; + private String itemsNameOperator = "="; + private String itermsConditions; + private String itermsConditionsOperator = "="; + private String newcarPutTime; + private String newcarPutTime1; + private String newcarPutTime2; + private String newcarPutTimeOperator = "="; + private String productPutTime; + private String productPutTime1; + private String productPutTime2; + private String productPutTimeOperator = "="; + private String menuId; + private String menuIdOperator = "="; + private String svpps; + private String svppsOperator = "="; + private String applyArctic; + private String applyArcticOperator = "="; + private String referenceStand; + private String referenceStandOperator = "="; + private String specialRequest; + private String specialRequestOperator = "="; + private String relevanceFile; + private String relevanceFileOperator = "="; + private String remarks; + private String remarksOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String modifyUser; + private String modifyUserOperator = "="; + private String sMenuId; + private List idList; + + private int tableIndex = 1; + private int imgIndex = 1; + + private List targetItemValEOList; + private String targetMenuId; + + public List getTargetItemValEOList() { + return targetItemValEOList; + } + + public void setTargetItemValEOList(List targetItemValEOList) { + this.targetItemValEOList = targetItemValEOList; + } + + public String getTargetMenuId() { + return targetMenuId; + } + + public void setTargetMenuId(String targetMenuId) { + this.targetMenuId = targetMenuId; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getInfoId() { + return this.infoId; + } + + public void setInfoId(String infoId) { + this.infoId = infoId; + } + + public String getInfoIdOperator() { + return this.infoIdOperator; + } + + public void setInfoIdOperator(String infoIdOperator) { + this.infoIdOperator = infoIdOperator; + } + + public String getItemsNum() { + return this.itemsNum; + } + + public void setItemsNum(String itemsNum) { + this.itemsNum = itemsNum; + } + + public String getItemsNumOperator() { + return this.itemsNumOperator; + } + + public void setItemsNumOperator(String itemsNumOperator) { + this.itemsNumOperator = itemsNumOperator; + } + + public String getItemsName() { + return this.itemsName; + } + + public void setItemsName(String itemsName) { + this.itemsName = itemsName; + } + + public String getItemsNameOperator() { + return this.itemsNameOperator; + } + + public void setItemsNameOperator(String itemsNameOperator) { + this.itemsNameOperator = itemsNameOperator; + } + + public String getItermsConditions() { + return this.itermsConditions; + } + + public void setItermsConditions(String itermsConditions) { + this.itermsConditions = itermsConditions; + } + + public String getItermsConditionsOperator() { + return this.itermsConditionsOperator; + } + + public void setItermsConditionsOperator(String itermsConditionsOperator) { + this.itermsConditionsOperator = itermsConditionsOperator; + } + + public String getNewcarPutTime() { + return this.newcarPutTime; + } + + public void setNewcarPutTime(String newcarPutTime) { + this.newcarPutTime = newcarPutTime; + } + + public String getNewcarPutTime1() { + return this.newcarPutTime1; + } + + public void setNewcarPutTime1(String newcarPutTime1) { + this.newcarPutTime1 = newcarPutTime1; + } + + public String getNewcarPutTime2() { + return this.newcarPutTime2; + } + + public void setNewcarPutTime2(String newcarPutTime2) { + this.newcarPutTime2 = newcarPutTime2; + } + + public String getNewcarPutTimeOperator() { + return this.newcarPutTimeOperator; + } + + public void setNewcarPutTimeOperator(String newcarPutTimeOperator) { + this.newcarPutTimeOperator = newcarPutTimeOperator; + } + + public String getProductPutTime() { + return this.productPutTime; + } + + public void setProductPutTime(String productPutTime) { + this.productPutTime = productPutTime; + } + + public String getProductPutTime1() { + return this.productPutTime1; + } + + public void setProductPutTime1(String productPutTime1) { + this.productPutTime1 = productPutTime1; + } + + public String getProductPutTime2() { + return this.productPutTime2; + } + + public void setProductPutTime2(String productPutTime2) { + this.productPutTime2 = productPutTime2; + } + + public String getProductPutTimeOperator() { + return this.productPutTimeOperator; + } + + public void setProductPutTimeOperator(String productPutTimeOperator) { + this.productPutTimeOperator = productPutTimeOperator; + } + + public String getMenuId() { + return this.menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getMenuIdOperator() { + return this.menuIdOperator; + } + + public void setMenuIdOperator(String menuIdOperator) { + this.menuIdOperator = menuIdOperator; + } + + public String getSvpps() { + return this.svpps; + } + + public void setSvpps(String svpps) { + this.svpps = svpps; + } + + public String getSvppsOperator() { + return this.svppsOperator; + } + + public void setSvppsOperator(String svppsOperator) { + this.svppsOperator = svppsOperator; + } + + public String getApplyArctic() { + return this.applyArctic; + } + + public void setApplyArctic(String applyArctic) { + this.applyArctic = applyArctic; + } + + public String getApplyArcticOperator() { + return this.applyArcticOperator; + } + + public void setApplyArcticOperator(String applyArcticOperator) { + this.applyArcticOperator = applyArcticOperator; + } + + public String getReferenceStand() { + return this.referenceStand; + } + + public void setReferenceStand(String referenceStand) { + this.referenceStand = referenceStand; + } + + public String getReferenceStandOperator() { + return this.referenceStandOperator; + } + + public void setReferenceStandOperator(String referenceStandOperator) { + this.referenceStandOperator = referenceStandOperator; + } + + public String getSpecialRequest() { + return this.specialRequest; + } + + public void setSpecialRequest(String specialRequest) { + this.specialRequest = specialRequest; + } + + public String getSpecialRequestOperator() { + return this.specialRequestOperator; + } + + public void setSpecialRequestOperator(String specialRequestOperator) { + this.specialRequestOperator = specialRequestOperator; + } + + public String getRelevanceFile() { + return this.relevanceFile; + } + + public void setRelevanceFile(String relevanceFile) { + this.relevanceFile = relevanceFile; + } + + public String getRelevanceFileOperator() { + return this.relevanceFileOperator; + } + + public void setRelevanceFileOperator(String relevanceFileOperator) { + this.relevanceFileOperator = relevanceFileOperator; + } + + public String getRemarks() { + return this.remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getRemarksOperator() { + return this.remarksOperator; + } + + public void setRemarksOperator(String remarksOperator) { + this.remarksOperator = remarksOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationUser() { + return this.creationUser; + } + + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + public String getCreationUserOperator() { + return this.creationUserOperator; + } + + public void setCreationUserOperator(String creationUserOperator) { + this.creationUserOperator = creationUserOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getModifyUser() { + return this.modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public String getModifyUserOperator() { + return this.modifyUserOperator; + } + + public void setModifyUserOperator(String modifyUserOperator) { + this.modifyUserOperator = modifyUserOperator; + } + + public String getsMenuId() { + return sMenuId; + } + + public void setsMenuId(String sMenuId) { + this.sMenuId = sMenuId; + } + + public List getIdList() { + return idList; + } + + public void setIdList(List idList) { + this.idList = idList; + } + + public int getTableIndex() { + return tableIndex; + } + + public void setTableIndex(int tableIndex) { + this.tableIndex = tableIndex; + } + + public int getImgIndex() { + return imgIndex; + } + + public void setImgIndex(int imgIndex) { + this.imgIndex = imgIndex; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsFileEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsFileEOPage.java new file mode 100644 index 000000000..16c50459b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsFileEOPage.java @@ -0,0 +1,212 @@ +package com.jero.modules.split.page; + +import com.jero.modules.split.common.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_FILE SarFileSplitItemsFileEOPage
    + * 作者：code generator
    + * 日期： 2020-03-30
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsFileEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String standId; + private String standIdOperator = "="; + private String resId; + private String resIdOperator = "="; + private String attId; + private String attIdOperator = "="; + private String useModel; + private String useModelOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String pageCount; + private String pageCountOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getStandId() { + return this.standId; + } + + public void setStandId(String standId) { + this.standId = standId; + } + + public String getStandIdOperator() { + return this.standIdOperator; + } + + public void setStandIdOperator(String standIdOperator) { + this.standIdOperator = standIdOperator; + } + + public String getResId() { + return this.resId; + } + + public void setResId(String resId) { + this.resId = resId; + } + + public String getResIdOperator() { + return this.resIdOperator; + } + + public void setResIdOperator(String resIdOperator) { + this.resIdOperator = resIdOperator; + } + + public String getAttId() { + return this.attId; + } + + public void setAttId(String attId) { + this.attId = attId; + } + + public String getAttIdOperator() { + return this.attIdOperator; + } + + public void setAttIdOperator(String attIdOperator) { + this.attIdOperator = attIdOperator; + } + + public String getUseModel() { + return this.useModel; + } + + public void setUseModel(String useModel) { + this.useModel = useModel; + } + + public String getUseModelOperator() { + return this.useModelOperator; + } + + public void setUseModelOperator(String useModelOperator) { + this.useModelOperator = useModelOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getPageCount() { + return this.pageCount; + } + + public void setPageCount(String pageCount) { + this.pageCount = pageCount; + } + + public String getPageCountOperator() { + return this.pageCountOperator; + } + + public void setPageCountOperator(String pageCountOperator) { + this.pageCountOperator = pageCountOperator; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsParamsEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsParamsEOPage.java new file mode 100644 index 000000000..dbf041453 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsParamsEOPage.java @@ -0,0 +1,194 @@ +package com.jero.modules.split.page; + +import com.jero.modules.split.common.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOPage
    + * 作者：code generator
    + * 日期： 2020-02-04
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsParamsEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String itemId; + private String itemIdOperator = "="; + private String description; + private String descriptionOperator = "="; + private String figure; + private String figureOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String infoId; + private String infoIdOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getItemId() { + return this.itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + + public String getItemIdOperator() { + return this.itemIdOperator; + } + + public void setItemIdOperator(String itemIdOperator) { + this.itemIdOperator = itemIdOperator; + } + + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getDescriptionOperator() { + return this.descriptionOperator; + } + + public void setDescriptionOperator(String descriptionOperator) { + this.descriptionOperator = descriptionOperator; + } + + public String getFigure() { + return this.figure; + } + + public void setFigure(String figure) { + this.figure = figure; + } + + public String getFigureOperator() { + return this.figureOperator; + } + + public void setFigureOperator(String figureOperator) { + this.figureOperator = figureOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getInfoId() { + return this.infoId; + } + + public void setInfoId(String infoId) { + this.infoId = infoId; + } + + public String getInfoIdOperator() { + return this.infoIdOperator; + } + + public void setInfoIdOperator(String infoIdOperator) { + this.infoIdOperator = infoIdOperator; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsResEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsResEOPage.java new file mode 100644 index 000000000..830e348c3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsResEOPage.java @@ -0,0 +1,194 @@ +package com.jero.modules.split.page; + +import com.jero.modules.split.common.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_RES SarFileSplitItemsResEOPage
    + * 作者：code generator
    + * 日期： 2020-03-30
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsResEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String standId; + private String standIdOperator = "="; + private String standFileClassify; + private String standFileClassifyOperator = "="; + private String fileName; + private String fileNameOperator = "="; + private String fileSuffix; + private String fileSuffixOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getStandId() { + return this.standId; + } + + public void setStandId(String standId) { + this.standId = standId; + } + + public String getStandIdOperator() { + return this.standIdOperator; + } + + public void setStandIdOperator(String standIdOperator) { + this.standIdOperator = standIdOperator; + } + + public String getStandFileClassify() { + return this.standFileClassify; + } + + public void setStandFileClassify(String standFileClassify) { + this.standFileClassify = standFileClassify; + } + + public String getStandFileClassifyOperator() { + return this.standFileClassifyOperator; + } + + public void setStandFileClassifyOperator(String standFileClassifyOperator) { + this.standFileClassifyOperator = standFileClassifyOperator; + } + + public String getFileName() { + return this.fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNameOperator() { + return this.fileNameOperator; + } + + public void setFileNameOperator(String fileNameOperator) { + this.fileNameOperator = fileNameOperator; + } + + public String getFileSuffix() { + return this.fileSuffix; + } + + public void setFileSuffix(String fileSuffix) { + this.fileSuffix = fileSuffix; + } + + public String getFileSuffixOperator() { + return this.fileSuffixOperator; + } + + public void setFileSuffixOperator(String fileSuffixOperator) { + this.fileSuffixOperator = fileSuffixOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsTableEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsTableEOPage.java new file mode 100644 index 000000000..a8d3803a3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsTableEOPage.java @@ -0,0 +1,230 @@ +package com.jero.modules.split.page; + +import com.jero.modules.split.common.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEOPage
    + * 作者：code generator
    + * 日期： 2020-01-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsTableEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String itemsValId; + private String itemsValIdOperator = "="; + private String itemsId; + private String itemsIdOperator = "="; + private String rowNum; + private String rowNumOperator = "="; + private String colNum; + private String colNumOperator = "="; + private String content; + private String contentOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String modifyUser; + private String modifyUserOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getItemsValId() { + return this.itemsValId; + } + + public void setItemsValId(String itemsValId) { + this.itemsValId = itemsValId; + } + + public String getItemsValIdOperator() { + return this.itemsValIdOperator; + } + + public void setItemsValIdOperator(String itemsValIdOperator) { + this.itemsValIdOperator = itemsValIdOperator; + } + + public String getItemsId() { + return this.itemsId; + } + + public void setItemsId(String itemsId) { + this.itemsId = itemsId; + } + + public String getItemsIdOperator() { + return this.itemsIdOperator; + } + + public void setItemsIdOperator(String itemsIdOperator) { + this.itemsIdOperator = itemsIdOperator; + } + + public String getRowNum() { + return this.rowNum; + } + + public void setRowNum(String rowNum) { + this.rowNum = rowNum; + } + + public String getRowNumOperator() { + return this.rowNumOperator; + } + + public void setRowNumOperator(String rowNumOperator) { + this.rowNumOperator = rowNumOperator; + } + + public String getColNum() { + return this.colNum; + } + + public void setColNum(String colNum) { + this.colNum = colNum; + } + + public String getColNumOperator() { + return this.colNumOperator; + } + + public void setColNumOperator(String colNumOperator) { + this.colNumOperator = colNumOperator; + } + + public String getContent() { + return this.content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getContentOperator() { + return this.contentOperator; + } + + public void setContentOperator(String contentOperator) { + this.contentOperator = contentOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getModifyUser() { + return this.modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public String getModifyUserOperator() { + return this.modifyUserOperator; + } + + public void setModifyUserOperator(String modifyUserOperator) { + this.modifyUserOperator = modifyUserOperator; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsValEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsValEOPage.java new file mode 100644 index 000000000..eff19c100 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsValEOPage.java @@ -0,0 +1,230 @@ +package com.jero.modules.split.page; + +import com.jero.modules.split.common.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_VAL SarFileSplitItemsValEOPage
    + * 作者：code generator
    + * 日期： 2020-01-07
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsValEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String type; + private String typeOperator = "="; + private String itemId; + private String itemIdOperator = "="; + private String itemContent; + private String itemContentOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String modifyUser; + private String modifyUserOperator = "="; + private String displaySeq; + private String displaySeqOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getType() { + return this.type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeOperator() { + return this.typeOperator; + } + + public void setTypeOperator(String typeOperator) { + this.typeOperator = typeOperator; + } + + public String getItemId() { + return this.itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + + public String getItemIdOperator() { + return this.itemIdOperator; + } + + public void setItemIdOperator(String itemIdOperator) { + this.itemIdOperator = itemIdOperator; + } + + public String getItemContent() { + return this.itemContent; + } + + public void setItemContent(String itemContent) { + this.itemContent = itemContent; + } + + public String getItemContentOperator() { + return this.itemContentOperator; + } + + public void setItemContentOperator(String itemContentOperator) { + this.itemContentOperator = itemContentOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationUser() { + return this.creationUser; + } + + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + public String getCreationUserOperator() { + return this.creationUserOperator; + } + + public void setCreationUserOperator(String creationUserOperator) { + this.creationUserOperator = creationUserOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getModifyUser() { + return this.modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public String getModifyUserOperator() { + return this.modifyUserOperator; + } + + public void setModifyUserOperator(String modifyUserOperator) { + this.modifyUserOperator = modifyUserOperator; + } + + public String getDisplaySeq() { + return this.displaySeq; + } + + public void setDisplaySeq(String displaySeq) { + this.displaySeq = displaySeq; + } + + public String getDisplaySeqOperator() { + return this.displaySeqOperator; + } + + public void setDisplaySeqOperator(String displaySeqOperator) { + this.displaySeqOperator = displaySeqOperator; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitMenuEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitMenuEOPage.java new file mode 100644 index 000000000..2bf10e238 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitMenuEOPage.java @@ -0,0 +1,248 @@ +package com.jero.modules.split.page; + +import com.jero.modules.split.common.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_MENU SarFileSplitMenuEOPage
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitMenuEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String infoId; + private String infoIdOperator = "="; + private String name; + private String nameOperator = "="; + private String pId; + private String pIdOperator = "="; + private String displaySeq; + private String displaySeqOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String remarks; + private String remarksOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String modifyUser; + private String modifyUserOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getInfoId() { + return this.infoId; + } + + public void setInfoId(String infoId) { + this.infoId = infoId; + } + + public String getInfoIdOperator() { + return this.infoIdOperator; + } + + public void setInfoIdOperator(String infoIdOperator) { + this.infoIdOperator = infoIdOperator; + } + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNameOperator() { + return this.nameOperator; + } + + public void setNameOperator(String nameOperator) { + this.nameOperator = nameOperator; + } + + public String getPId() { + return this.pId; + } + + public void setPId(String pId) { + this.pId = pId; + } + + public String getPIdOperator() { + return this.pIdOperator; + } + + public void setPIdOperator(String pIdOperator) { + this.pIdOperator = pIdOperator; + } + + public String getDisplaySeq() { + return this.displaySeq; + } + + public void setDisplaySeq(String displaySeq) { + this.displaySeq = displaySeq; + } + + public String getDisplaySeqOperator() { + return this.displaySeqOperator; + } + + public void setDisplaySeqOperator(String displaySeqOperator) { + this.displaySeqOperator = displaySeqOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getRemarks() { + return this.remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getRemarksOperator() { + return this.remarksOperator; + } + + public void setRemarksOperator(String remarksOperator) { + this.remarksOperator = remarksOperator; + } + + public String getCreationUser() { + return this.creationUser; + } + + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + public String getCreationUserOperator() { + return this.creationUserOperator; + } + + public void setCreationUserOperator(String creationUserOperator) { + this.creationUserOperator = creationUserOperator; + } + + public String getModifyUser() { + return this.modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public String getModifyUserOperator() { + return this.modifyUserOperator; + } + + public void setModifyUserOperator(String modifyUserOperator) { + this.modifyUserOperator = modifyUserOperator; + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsEOService.java new file mode 100644 index 000000000..c57462cdb --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsEOService.java @@ -0,0 +1,115 @@ +package com.jero.modules.split.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.common.api.vo.Result; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.split.common.SplitTableInfo; +import com.jero.modules.split.dto.*; +import com.jero.modules.split.entity.SarFileSplitItemsEO; +import com.jero.modules.split.entity.SarFileSplitItemsTableEO; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.entity.SarFileSplitMenuTreeNode; +import com.jero.modules.split.page.SarFileSplitItemsEOPage; + +import java.io.IOException; +import java.util.List; +import java.util.Map; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEOService
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface ISarFileSplitItemsEOService extends IService { + + int deleteByItemsIds(SarFileSplitItemsEO sarFileSplitItemsEO); + + int addItemContent(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception; + + int updateItemContent(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception; + + int updateItemContentAfterBathDel(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception; + + Map moveSplitItemsVal(SarFileSplitItemsEOPage page) throws Exception ; + + void saveFileInfo (SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception; + + + int insert(SarFileSplitItemsEO SarFileSplitItemsEO); + + int insertSelective(SarFileSplitItemsEO SarFileSplitItemsEO); + + int updateByPrimaryKey(SarFileSplitItemsEO SarFileSplitItemsEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsEO SarFileSplitItemsEO); + + SarFileSplitItemsEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsEOPage page); + + int queryByCount(SarFileSplitItemsEOPage page); + + List queryByPage(SarFileSplitItemsEOPage page); + + public String insertSarStandFile(String standId, List list, String standFileClassify,String newFiles) throws Exception ; + + public Map> getNotDeleteMsgFile(SarFileSplitItemsEO sarFileSplitItemsEO); + + public String getNotDelFile(String fileAttIds,List getNotDeleteResId,List getNotDeleteFileId); + + public String insertItemTable(List getValList,String itemId); + + /** + * @Author yangxuenan + * @Description 添加特殊参数要求内容 + * Date 2020/2/4 15:56 + * @Param [sarFileSplitItemsEO] + * @return void + **/ + public void addParamsContent(SarFileSplitItemsEO sarFileSplitItemsEO); + + /** + * @Author yangxuenan + * @Description 修改特殊参数要求内容 + * Date 2020/2/4 15:56 + * @Param [sarFileSplitItemsEO] + * @return void + **/ + public void updateParamsContent(SarFileSplitItemsEO sarFileSplitItemsEO); + + public List queryByItemsIds(List idList); + + public int batchDeleteItems(String ids); + + public Map judgeContaintChilds(String ids) throws Exception ; + + public List queryByOrdersForExport(SarFileSplitItemsEOPage page); + + public List combineItemValInfo(List getValList, List allTableList, List allImgList, SarFileSplitItemsEOPage page) throws Exception; + + public List> combineTableList(SarFileSplitItemsValEO itemsValEO) throws Exception; + + public void downLoadImgList(List allImgList,String fileNowPath) throws IOException ; + + public void downLoadFileList(List allRelevFileList, String fileNowPath) throws IOException ; + + public void copyFile1(String srcPath, String destPath) throws IOException ; + + public List queryByList2(SarFileSplitItemsEOPage page); + + public Result importSplitItems(List list, String menuId, String filepath, String infoId, List getSheetTableList); + + public List buildTree(List addItemsEOList, Long treeListDisplay, String menuId); + + public Map validateImportDatas(List datas, String filepath) throws Exception ; + + public void createItemsInfo(SarFileSplitItemsEO sarFileSplitItemsEO,String menuId,String infoId); + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsFileEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsFileEOService.java new file mode 100644 index 000000000..b84f1c4a0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsFileEOService.java @@ -0,0 +1,39 @@ +package com.jero.modules.split.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.split.entity.SarFileSplitItemsFileEO; +import com.jero.modules.split.page.SarFileSplitItemsFileEOPage; + +import java.util.List; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_FILE SarFileSplitItemsFileEOService
    + * 作者：code generator
    + * 日期： 2020-03-30
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface ISarFileSplitItemsFileEOService extends IService { + List selectFileByAttId(String attId); + + int insert(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); + + int insertSelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); + + int updateByPrimaryKey(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); + + SarFileSplitItemsFileEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsFileEOPage page); + + int queryByCount(SarFileSplitItemsFileEOPage page); + + List queryByPage(SarFileSplitItemsFileEOPage page); + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsParamsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsParamsEOService.java new file mode 100644 index 000000000..8329495ab --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsParamsEOService.java @@ -0,0 +1,38 @@ +package com.jero.modules.split.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.split.entity.SarFileSplitItemsParamsEO; +import com.jero.modules.split.page.SarFileSplitItemsParamsEOPage; + +import java.util.List; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOService
    + * 作者：code generator
    + * 日期： 2020-02-04
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface ISarFileSplitItemsParamsEOService extends IService { + int deleteByItemIds(List idList); + + int insert(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); + + int insertSelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); + + int updateByPrimaryKey(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); + + SarFileSplitItemsParamsEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsParamsEOPage page); + + int queryByCount(SarFileSplitItemsParamsEOPage page); + + List queryByPage(SarFileSplitItemsParamsEOPage page); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsResEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsResEOService.java new file mode 100644 index 000000000..3c863c1bb --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsResEOService.java @@ -0,0 +1,37 @@ +package com.jero.modules.split.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.split.entity.SarFileSplitItemsResEO; +import com.jero.modules.split.page.SarFileSplitItemsResEOPage; + +import java.util.List; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_RES SarFileSplitItemsResEOService
    + * 作者：code generator
    + * 日期： 2020-03-30
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface ISarFileSplitItemsResEOService extends IService { + + int insert(SarFileSplitItemsResEO sarFileSplitItemsResEO); + + int insertSelective(SarFileSplitItemsResEO sarFileSplitItemsResEO); + + int updateByPrimaryKey(SarFileSplitItemsResEO sarFileSplitItemsResEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsResEO sarFileSplitItemsResEO); + + SarFileSplitItemsResEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsResEOPage page); + + int queryByCount(SarFileSplitItemsResEOPage page); + + List queryByPage(SarFileSplitItemsResEOPage page); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsTableEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsTableEOService.java new file mode 100644 index 000000000..23118f7d4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsTableEOService.java @@ -0,0 +1,49 @@ +package com.jero.modules.split.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.split.entity.SarFileSplitItemsTableEO; +import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEOService
    + * 作者：code generator
    + * 日期： 2020-01-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("sarFileSplitItemsTableEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public interface ISarFileSplitItemsTableEOService extends IService { + + List queryByRowNum(SarFileSplitItemsTableEOPage page); + + int deleteByitemIds(List idList); + + + int insert(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); + + int insertSelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); + + int updateByPrimaryKey(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); + + SarFileSplitItemsTableEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsTableEOPage page); + + int queryByCount(SarFileSplitItemsTableEOPage page); + + List queryByPage(SarFileSplitItemsTableEOPage page); + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsValEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsValEOService.java new file mode 100644 index 000000000..3a1f322b9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsValEOService.java @@ -0,0 +1,43 @@ +package com.jero.modules.split.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; + +import java.util.List; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_VAL SarFileSplitItemsValEOService
    + * 作者：code generator
    + * 日期： 2020-01-07
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface ISarFileSplitItemsValEOService extends IService { + + int deleteValByitemIds(List idList); + + List getSplitItemsByMenu(String menuId,String infoId); + + + int insert(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + int insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + int updateByPrimaryKey(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + int updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + SarFileSplitItemsValEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitItemsValEOPage page); + + int queryByCount(SarFileSplitItemsValEOPage page); + + List queryByPage(SarFileSplitItemsValEOPage page); + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java new file mode 100644 index 000000000..944f14360 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java @@ -0,0 +1,57 @@ +package com.jero.modules.split.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.split.entity.DrageMenuEO; +import com.jero.modules.split.entity.SarFileSplitItemsEO; +import com.jero.modules.split.entity.SarFileSplitMenuEO; +import com.jero.modules.split.page.SarFileSplitMenuEOPage; + +import java.util.List; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_MENU SarFileSplitMenuEOService
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface ISarFileSplitMenuEOService extends IService { + + int dragMenu(DrageMenuEO drageMenuEO); + // 通过ID查询该结点及结点下所有的节点排序的最大值 + int getMaxDisplayByid(String menuID) ; + + int addMenu(SarFileSplitMenuEO sarFileSplitMenuEO); + + boolean judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception ; + + void deleteMenu(String id); + + int copyMenu (SarFileSplitMenuEO sarMenuEO) ; + + int copyMenuNotChildren(SarFileSplitItemsEO sarFileSplitItemsEO) ; + + String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO); + + + + int insert(SarFileSplitMenuEO sarFileSplitMenuEO); + + int insertSelective(SarFileSplitMenuEO sarFileSplitMenuEO); + + int updateByPrimaryKey(SarFileSplitMenuEO sarFileSplitMenuEO); + + int updateByPrimaryKeySelective(SarFileSplitMenuEO sarFileSplitMenuEO); + + SarFileSplitMenuEO selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List queryByList(SarFileSplitMenuEOPage page); + + int queryByCount(SarFileSplitMenuEOPage page); + + List queryByPage(SarFileSplitMenuEOPage page); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsEOServiceImpl.java new file mode 100644 index 000000000..d4a48a226 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -0,0 +1,1470 @@ +package com.jero.modules.split.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.api.vo.Result; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.split.common.FileUnZip; +import com.jero.modules.split.common.SplitTableInfo; +import com.jero.modules.split.dto.*; +import com.jero.modules.split.entity.*; +import com.jero.modules.split.enums.StandFileClassifyEnum; +import com.jero.modules.split.enums.UseModuleEnum; +import com.jero.modules.split.enums.ValueStateEnum; +import com.jero.modules.split.mapper.*; +import com.jero.modules.split.page.SarFileSplitItemsEOPage; +import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; +import com.jero.modules.split.page.SarFileSplitMenuEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsEOService; +import com.jero.modules.split.service.ISarFileSplitItemsValEOService; +import com.jero.modules.split.service.ISarFileSplitMenuEOService; +import com.jero.modules.split.util.ExcelUtil; +import com.jero.modules.system.mapper.SysDictMapper; +import com.jero.modules.system.util.StringUtils; +import com.jero.modules.system.util.UserUtils; +import org.apache.commons.collections.CollectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.*; +import java.util.stream.Collectors; + +import static com.jero.modules.split.util.ExcelUtil.checkObjAllFieldsIsNull; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEOService
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("sarFileSplitItemsEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitItemsEOServiceImpl extends ServiceImpl implements ISarFileSplitItemsEOService { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsEOServiceImpl.class); + + @Autowired + private SarFileSplitItemsEOMapper dao; + + @Autowired + private SarFileSplitItemsValEOMapper sarFileSplitItemsValEOMapper; + + @Autowired + private SarFileSplitItemsTableEOMapper sarFileSplitItemsTableEOMapper; + + @Autowired + private SarFileSplitItemsParamsMapper sarFileSplitItemsParamsMapper; + + @Autowired + private SarFileSplitMenuEOMapper sarFileSplitMenuEOMapper; + + @Autowired + private SarFileSplitItemsResEOMapper sarFileSplitItemsResEOMapper; + + @Autowired + private SarFileSplitItemsFileEOMapper sarFileSplitItemsFileEOMapper; + + @Autowired + private IOSSFileService ossFileService; + +// @Autowired +// private CreateMQService convertMq; + +// @Autowired +// private OtConvertEODao otConvertEODao; + + @Autowired + private SysDictMapper sysDictMapper; + + @Autowired + private ISarFileSplitMenuEOService sarFileSplitMenuEOService; + + @Autowired + private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService; + + @Value("${jero.path.upload}") + private String uploadFilePath; + + public int deleteByItemsIds(SarFileSplitItemsEO sarFileSplitItemsEO){ + return dao.deleteByItemsIds(sarFileSplitItemsEO); + } + + public int addItemContent(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception{ + List getValList = sarFileSplitItemsEO.getItemValEOList(); + String itemConditions = ""; + String userId = UserUtils.getUserId(); + String itemId = UUID.randomUUID().toString().replace("-", ""); + sarFileSplitItemsEO.setId(itemId); + int resultCount = 0; + //添加特殊参数要求信息 + addParamsContent(sarFileSplitItemsEO); + //添加条款要求内容 + if (getValList != null && !getValList.isEmpty()) { + //向val表更新数据 + int ind = 1; + List addValList = new ArrayList<>(); + for (SarFileSplitItemsValEO valEO : getValList) { + // 当前段内容 + String valContent = ""; + if ("TEXT".equals(valEO.getType())) { + valContent = "

    " + valEO.getItemContent() + "

    "; + } else if ("IMG".equals(valEO.getType())) { +// valContent = ""; + valContent = valEO.getItemContent(); + } else if ("TABLE".equals(valEO.getType())) { + valContent = valEO.getItemContent(); + } + itemConditions += valContent; + // val表信息 + valEO.setId(UUID.randomUUID().toString().replace("-", "")); + valEO.setItemId(itemId); +// valEO.setDisplaySeq(ind); + valEO.setValidFlag(0); + valEO.setCreationTime(new Date()); + valEO.setModifyTime(new Date()); + valEO.setCreationUser(userId); + valEO.setModifyUser(userId); + addValList.add(valEO); +// sarFileSplitItemsValEODao.insertSelective(valEO); + + ind++; + } + if (addValList != null && !addValList.isEmpty()) { + sarFileSplitItemsValEOMapper.insertForeach(addValList); + } + sarFileSplitItemsEO.setItermsConditions(itemConditions); +// saveFileInfo(sarFileSplitItemsEO); + } + sarFileSplitItemsEO.setCreationTime(new Date()); + sarFileSplitItemsEO.setCreationUser(userId); + sarFileSplitItemsEO.setModifyTime(new Date()); + sarFileSplitItemsEO.setModifyUser(userId); + sarFileSplitItemsEO.setValidFlag(0); + resultCount = dao.insertSelective(sarFileSplitItemsEO); + return resultCount; + } + + public int updateItemContent(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception{ + List getValList = sarFileSplitItemsEO.getItemValEOList(); + String itemConditions = ""; + String userId = UserUtils.getUserId(); + int resultCount = 0; + //修改特殊参数要求信息 + updateParamsContent(sarFileSplitItemsEO); + //修改条款要求内容 + if (getValList != null && !getValList.isEmpty()) { + String delIds = sarFileSplitItemsEO.getDelItemIds(); + List itemValIds = new ArrayList<>(); + //删除VAL表前台删掉的条目信息 + if (StringUtils.isNotEmpty(delIds)) { + String[] delArr = delIds.split(","); + SarFileSplitItemsValEO delEO = new SarFileSplitItemsValEO(); + delEO.setIdList(delArr); + if (delArr != null && delArr.length > 0) { + sarFileSplitItemsValEOMapper.deleteByIds(delEO); + //删除table表数据 + itemValIds = new ArrayList<>(Arrays.asList(delArr)); + } + } + //向val表更新数据 + int ind = 1; + List addValList = new ArrayList<>(); + List updateValList = new ArrayList<>(); + for (SarFileSplitItemsValEO valEO : getValList) { + // 当前段内容 + String valContent = ""; + if ("TEXT".equals(valEO.getType())) { + valContent = "

    " + valEO.getItemContent() + "

    "; + } else if ("IMG".equals(valEO.getType())) { +// valContent = ""; + valContent = valEO.getItemContent(); + } else if ("TABLE".equals(valEO.getType())) { + valContent = valEO.getItemContent(); + } + itemConditions += valContent; + // val表信息 + if (StringUtils.isNotEmpty(valEO.getId())) { +// valEO.setDisplaySeq(ind); + valEO.setModifyTime(new Date()); + valEO.setModifyUser(userId); + updateValList.add(valEO); + itemValIds.add(valEO.getId()); +// sarFileSplitItemsValEODao.updateByPrimaryKeySelective(valEO); + } else { + valEO.setId(UUID.randomUUID().toString().replace("-", "")); +// valEO.setDisplaySeq(ind); + valEO.setValidFlag(0); + valEO.setCreationTime(new Date()); + valEO.setModifyTime(new Date()); + valEO.setCreationUser(userId); + valEO.setModifyUser(userId); + addValList.add(valEO); +// sarFileSplitItemsValEODao.insertSelective(valEO); + } + ind++; + } + if (addValList != null && !addValList.isEmpty()) { + sarFileSplitItemsValEOMapper.insertForeach(addValList); + } + if (updateValList != null && !updateValList.isEmpty()) { + sarFileSplitItemsValEOMapper.updateForeach(updateValList); + } +// sarFileSplitItemsTableEODao.deleteByitemValIds(itemValIds); + sarFileSplitItemsEO.setItermsConditions(itemConditions); +// saveFileInfo(sarFileSplitItemsEO); + resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); + } else { +// SarFileSplitItemsEO itemsEO = new SarFileSplitItemsEO(); +// itemsEO.setId(sarFileSplitItemsEO.getId()); + sarFileSplitItemsEO.setItermsConditions(""); +// saveFileInfo(sarFileSplitItemsEO); + resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); + // 删除val表全部信息 + sarFileSplitItemsValEOMapper.deleteByitemId(sarFileSplitItemsEO.getId()); + } + return resultCount; + } + + public int updateItemContentAfterBathDel(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception{ + List getValList = sarFileSplitItemsEO.getItemValEOList(); + + String itemConditions = ""; + String userId = UserUtils.getUserId(); + int resultCount = 0; + //修改条款要求内容 + if (getValList != null && !getValList.isEmpty()) { + String delIds = sarFileSplitItemsEO.getDelItemIds(); + List itemValIds = new ArrayList<>(); + //删除VAL表前台删掉的条目信息 + if (StringUtils.isNotEmpty(delIds)) { + String[] delArr = delIds.split(","); + SarFileSplitItemsValEO delEO = new SarFileSplitItemsValEO(); + delEO.setIdList(delArr); + if (delArr != null && delArr.length > 0) { + sarFileSplitItemsValEOMapper.deleteByIds(delEO); + } + + //过滤掉要删除的条目 + for(int i=0; i delValEOs = getValList.stream().filter(e->e.getId().equals(delValEOId)).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(delValEOs)) { + getValList.removeAll(delValEOs); + } + } + } + //向val表更新数据 + int ind = 1; + List addValList = new ArrayList<>(); + List updateValList = new ArrayList<>(); + for (SarFileSplitItemsValEO valEO : getValList) { + // 当前段内容 + String valContent = ""; + if ("TEXT".equals(valEO.getType())) { + valContent = "

    " + valEO.getItemContent() + "

    "; + } else if ("IMG".equals(valEO.getType())) { +// valContent = ""; + valContent = valEO.getItemContent(); + } else if ("TABLE".equals(valEO.getType())) { + valContent = valEO.getItemContent(); + } + itemConditions += valContent; + } + +// sarFileSplitItemsTableEODao.deleteByitemValIds(itemValIds); + sarFileSplitItemsEO.setItermsConditions(itemConditions); +// saveFileInfo(sarFileSplitItemsEO); + resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); + } else { +// SarFileSplitItemsEO itemsEO = new SarFileSplitItemsEO(); +// itemsEO.setId(sarFileSplitItemsEO.getId()); + sarFileSplitItemsEO.setItermsConditions(""); +// saveFileInfo(sarFileSplitItemsEO); + resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); + // 删除val表全部信息 + sarFileSplitItemsValEOMapper.deleteByitemId(sarFileSplitItemsEO.getId()); + } + return resultCount; + } + + public Map moveSplitItemsVal(SarFileSplitItemsEOPage page) throws Exception { + Map resultMsgMap = new HashMap<>(); + //1. 根据targetMenuId查询要移动的目录下是否有条款 + SarFileSplitItemsEOPage targetPage = new SarFileSplitItemsEOPage(); + targetPage.setMenuId(page.getTargetMenuId()); + targetPage.setInfoId(page.getInfoId()); + targetPage.setValidFlag("0"); + targetPage.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + List targetItemsList = dao.queryByList2(targetPage); // 查询结果包含子节点下条款 + if (CollectionUtils.isEmpty(targetItemsList)) { + resultMsgMap.put("code", "1"); + resultMsgMap.put("msg", "选择的目录下没有条款"); + return resultMsgMap; + } + + List getTargetValList = page.getTargetItemValEOList(); + //2. 修改被移动条款信息 + //查询被移动条款详情 + SarFileSplitItemsEO sarFileSplitItemsEO = dao.selectByPrimaryKey(page.getId()); + if (sarFileSplitItemsEO != null) { + SarFileSplitItemsValEOPage sarFileSplitItemsValEOPage = new SarFileSplitItemsValEOPage(); + sarFileSplitItemsValEOPage.setItemId(page.getId()); + sarFileSplitItemsValEOPage.setOrderBy("DISPLAY_SEQ,ID"); + List getValList = sarFileSplitItemsValEOService.queryByList(sarFileSplitItemsValEOPage); + String itemConditions = ""; + //修改被移动条款要求内容 + if (getValList != null && !getValList.isEmpty()) { + //删除VAL表被移动的条目信息 + if (CollectionUtils.isNotEmpty(getTargetValList)) { + List itemValIds = getTargetValList.stream().filter(e -> StringUtils.isNotBlank(e.getId())).map(SarFileSplitItemsValEO::getId).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(itemValIds)) { + String[] delArr = StringUtils.listToString(itemValIds).split(","); + SarFileSplitItemsValEO delEO = new SarFileSplitItemsValEO(); + delEO.setIdList(delArr); + if (delArr != null && delArr.length > 0) { + sarFileSplitItemsValEOMapper.deleteByIds(delEO); + } + + //过滤掉要删除的条目 + for (int i = 0; i < delArr.length; i++) { + String delValEOId = delArr[i]; + List delValEOs = getValList.stream().filter(e -> e.getId().equals(delValEOId)).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(delValEOs)) { + getValList.removeAll(delValEOs); + } + } + } + } + + for (SarFileSplitItemsValEO valEO : getValList) { + // 当前段内容 + String valContent = ""; + if ("TEXT".equals(valEO.getType())) { + valContent = "

    " + valEO.getItemContent() + "

    "; + } else if ("IMG".equals(valEO.getType())) { +// valContent = ""; + valContent = valEO.getItemContent(); + } else if ("TABLE".equals(valEO.getType())) { + valContent = valEO.getItemContent(); + } + itemConditions += valContent; + } + + sarFileSplitItemsEO.setItermsConditions(itemConditions); + dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); + } + } + + //3. 修改目标条款信息 + //获取目标条款详情 + SarFileSplitItemsEO targetItemsEO = targetItemsList.get(0); // 当目录下有多个条款时，默认修改第一条 + + SarFileSplitItemsValEOPage sarFileSplitItemsValEOPage = new SarFileSplitItemsValEOPage(); + sarFileSplitItemsValEOPage.setItemId(targetItemsEO.getId()); + sarFileSplitItemsValEOPage.setOrderBy("DISPLAY_SEQ,ID"); + List getValList = sarFileSplitItemsValEOService.queryByList(sarFileSplitItemsValEOPage); + String itemConditions = ""; + String userId = UserUtils.getUserId(); + int resultCount = 0; + int ind = 1; + //向指定条款的val表添加数据，添加至最后 + if(CollectionUtils.isNotEmpty(getValList)) { + ind = getValList.get(getValList.size() - 1).getDisplaySeq() + 1; + } + for (SarFileSplitItemsValEO valEO : getTargetValList) { + if(StringUtils.isBlank(valEO.getId())){ + valEO.setId(UUID.randomUUID().toString().replace("-", "")); + valEO.setItemId(targetItemsEO.getId()); + valEO.setDisplaySeq(ind); + valEO.setValidFlag(0); + valEO.setCreationTime(new Date()); + valEO.setModifyTime(new Date()); + valEO.setCreationUser(userId); + valEO.setModifyUser(userId); + }else{ + valEO.setItemId(targetItemsEO.getId()); + valEO.setDisplaySeq(ind); + valEO.setModifyTime(new Date()); + valEO.setModifyUser(userId); + } + ind++; + } + getValList.addAll(getTargetValList); + for (SarFileSplitItemsValEO valEO : getValList) { + // 当前段内容 + String valContent = ""; + if ("TEXT".equals(valEO.getType())) { + valContent = "

    " + valEO.getItemContent() + "

    "; + } else if ("IMG".equals(valEO.getType())) { +// valContent = ""; + valContent = valEO.getItemContent(); + } else if ("TABLE".equals(valEO.getType())) { + valContent = valEO.getItemContent(); + } + itemConditions += valContent; + } + + sarFileSplitItemsValEOMapper.insertForeach(getTargetValList); + + targetItemsEO.setItermsConditions(itemConditions); + resultCount = dao.updateByPrimaryKeySelective(targetItemsEO); + if(resultCount > 0){ + resultMsgMap.put("code", "0"); + resultMsgMap.put("msg", "移动成功"); + return resultMsgMap; + }else{ + resultMsgMap.put("code", "1"); + resultMsgMap.put("msg", "移动失败"); + return resultMsgMap; + } + } + + + public void saveFileInfo (SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { + //判断文件是否是新添加的 + Map> resultMap = getNotDeleteMsgFile(sarFileSplitItemsEO); + List getNotDeleteResId = resultMap.get("notDelResIds"); + List getNotDeleteFileId = resultMap.get("notDelFileIds"); + //删除文件资源表数据 + SarFileSplitItemsResEO sarLawsResEO = new SarFileSplitItemsResEO(); + sarLawsResEO.setStandId(sarFileSplitItemsEO.getId()); + if(getNotDeleteResId != null && !getNotDeleteResId.isEmpty()){ + sarLawsResEO.setIdlist(getNotDeleteResId); + } else { + sarLawsResEO.setIdlist(null); + } + List listRes = sarFileSplitItemsResEOMapper.selectByItemsIdAndId(sarLawsResEO); + if (listRes != null) { + if (!listRes.isEmpty()) { + for (int r = 0; r < listRes.size(); r++) { + sarFileSplitItemsResEOMapper.deleteByPrimaryKey(listRes.get(r).getId()); + } + } + } + //删除文件详情表数据 + SarFileSplitItemsFileEO sarLawsFileEO = new SarFileSplitItemsFileEO(); + sarLawsFileEO.setStandId(sarFileSplitItemsEO.getId()); + if(getNotDeleteFileId != null && !getNotDeleteFileId.isEmpty()){ + sarLawsFileEO.setIdlist(getNotDeleteFileId); + }else { + sarLawsFileEO.setIdlist(null); + } + List listFile = sarFileSplitItemsFileEOMapper.selectFileByItemsIdAndId(sarLawsFileEO); + if (listFile != null) { + if (!listFile.isEmpty()) { + for (int f = 0; f < listFile.size(); f++) { + sarFileSplitItemsFileEOMapper.deleteByPrimaryKey(listFile.get(f).getId()); + //删除文件信息表数据 +// sarFileInfoEODao.deleteByfileId(listFile.get(f).getId()); + //删除转换表ot_convert数据 +// otConvertEODao.deleteByAttId(listFile.get(f).getAttId()); + } + } + } + //添加新的文件表信息 + if (StringUtils.isNotEmpty(sarFileSplitItemsEO.getRelevanceFile())) { + List fileList = ossFileService.getFileInfos(sarFileSplitItemsEO.getRelevanceFile()); + String reslist = insertSarStandFile(sarFileSplitItemsEO.getId(), fileList, StandFileClassifyEnum.RELEVANCE_FILE.getValue(),sarFileSplitItemsEO.getRelevanceFileAttid()); + } + } + + @Override + public int insert(SarFileSplitItemsEO sarFileSplitItemsEO) { + return dao.insert(sarFileSplitItemsEO); + } + + @Override + public int insertSelective(SarFileSplitItemsEO sarFileSplitItemsEO) { + return dao.insertSelective(sarFileSplitItemsEO); + } + + @Override + public int updateByPrimaryKey(SarFileSplitItemsEO sarFileSplitItemsEO) { + return dao.updateByPrimaryKey(sarFileSplitItemsEO); + } + + @Override + public int updateByPrimaryKeySelective(SarFileSplitItemsEO sarFileSplitItemsEO) { + return dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); + } + + @Override + public SarFileSplitItemsEO selectByPrimaryKey(String value) { + return dao.selectByPrimaryKey(value); + } + + @Override + public int deleteByPrimaryKey(String value) { + return dao.deleteByPrimaryKey(value); + } + + @Override + public List queryByList(SarFileSplitItemsEOPage page) { + return dao.queryByList(page); + } + + @Override + public int queryByCount(SarFileSplitItemsEOPage page) { + return dao.queryByCount(page); + } + + @Override + public List queryByPage(SarFileSplitItemsEOPage page) { + return dao.queryByPage(page); + } + + public String insertSarStandFile(String standId, List list, String standFileClassify, String newFiles) throws Exception { + String residlist = ""; + String newFileArr[] = newFiles.split(","); + List newAttList = Arrays.asList(newFileArr); + if (list != null) { + SarFileSplitItemsResEO sarStandResEO = new SarFileSplitItemsResEO(); + SarFileSplitItemsFileEO sarStandFileEO = new SarFileSplitItemsFileEO(); + for (OSSFile fileInfo : list) { + if(newAttList != null && newAttList.contains(fileInfo.getId())){ + //标准文件资源表存数据库 + sarStandResEO.setStandId(standId); //标准ID + sarStandResEO.setStandFileClassify(standFileClassify); //文件分类 + sarStandResEO.setFileName(fileInfo.getFileName()); //文件名称@@@@@@@需要确定取name 还是 oldname + + String fileSuffix = fileInfo.getFileName().substring(fileInfo.getFileName().lastIndexOf(".")+1); + sarStandResEO.setFileSuffix(fileSuffix); //文件类型 + sarStandResEO.setId(UUID.randomUUID().toString().replace("-", "")); + sarStandResEO.setCreationTime(new Date()); + sarStandResEO.setModifyTime(new Date()); + sarStandResEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); + int i = sarFileSplitItemsResEOMapper.insertSelective(sarStandResEO); + residlist += sarStandResEO.getId() + ","; + //标准文件详情表存数据库 + sarStandFileEO.setId(UUID.randomUUID().toString().replace("-", "")); + sarStandFileEO.setCreationTime(new Date()); + sarStandFileEO.setModifyTime(new Date()); + sarStandFileEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); + sarStandFileEO.setStandId(standId); //标准ID + sarStandFileEO.setResId(sarStandResEO.getId()); //资源ID + sarStandFileEO.setAttId(fileInfo.getId()); //文件ID + sarStandFileEO.setUseModel(UseModuleEnum.SOURCE_FILE.getValue()); //文件使用模式 //文件名称@@@@@@@需要修改 + sarFileSplitItemsFileEOMapper.insertSelective(sarStandFileEO); + + //文档转换 + if ("pdf".equals(fileSuffix) || "PDF".equals(fileSuffix)) { + sarStandFileEO.setId(UUID.randomUUID().toString().replace("-", "")); + sarStandFileEO.setUseModel(UseModuleEnum.WEB_FILE.getValue()); //文件使用模式 //文件名称@@@@@@@需要修改 + sarFileSplitItemsFileEOMapper.insertSelective(sarStandFileEO); + } else { + String filePath = fileInfo.getUrl(); +// ConvertMqEO convert = new ConvertMqEO(); +// convert.setLawsId(standId); +// convert.setResId(sarStandResEO.getId()); +// convert.setAttId(fileInfo.getId()); +// convert.setFilePath(filePath); +// convert.setAddOrUp("0"); +// convert.setFileSuffix(fileInfo.getFileSuffix()); +// convert.setConvertType(SarTypeEnum.SPLIT.getValue()); +// convertMq.sendMQ(convert); + } + } else { + List getFile = sarFileSplitItemsFileEOMapper.selectFileMsgByAttId(fileInfo.getId()); + if(getFile != null && !getFile.isEmpty()){ + residlist += getFile.get(0).getResId() + ","; + } + } + + } + } + return residlist; + } + + public Map> getNotDeleteMsgFile(SarFileSplitItemsEO sarFileSplitItemsEO){ + Map> resultMap = new HashMap<>(); + List getNotDeleteResId = new ArrayList<>(); + List getNotDeleteFileId = new ArrayList<>(); + String newStandFile = ""; + //向文件表添加关联文件数据 + String newrelevanceFile = ""; + if (StringUtils.isNotEmpty(sarFileSplitItemsEO.getRelevanceFile())) { + newrelevanceFile = getNotDelFile(sarFileSplitItemsEO.getRelevanceFile(),getNotDeleteResId,getNotDeleteFileId); + } + sarFileSplitItemsEO.setRelevanceFileAttid(newrelevanceFile); + resultMap.put("notDelResIds",getNotDeleteResId); + resultMap.put("notDelFileIds",getNotDeleteFileId); + return resultMap; + } + + public String getNotDelFile(String fileAttIds,List getNotDeleteResId,List getNotDeleteFileId){ + String splitFile[] = fileAttIds.split(","); + String newFiles = ""; + for(int i=0;i getFile = sarFileSplitItemsFileEOMapper.selectFileMsgByAttId(splitFile[i]); + if(getFile != null && !getFile.isEmpty()){ + for(SarFileSplitItemsFileEO sarStandFileEO : getFile){ + getNotDeleteResId.add(sarStandFileEO.getResId()); + getNotDeleteFileId.add(sarStandFileEO.getId()); + } + List getWebFile = sarFileSplitItemsFileEOMapper.selectFileByAttId(splitFile[i]); + if(getWebFile != null && !getWebFile.isEmpty()){ + getNotDeleteFileId.add(getWebFile.get(0).getId()); + } + + } else { + newFiles += splitFile[i] + ","; + } + } + return newFiles; + } + + public String insertItemTable(List getValList,String itemId){ + String itemContent = ""; + if (getValList != null && !getValList.isEmpty()) { + List alltableList = new ArrayList<>(); + for(SarFileSplitItemsValEO val : getValList){ + List> listShow = val.getTableListShow(); + if ("TABLE".equals(val.getType()) && listShow != null && !listShow.isEmpty()) { + for (List tableList : listShow) { + itemContent += ""; + for (SarFileSplitItemsTableEO tableEO : tableList) { + itemContent += ""; + tableEO.setId(UUID.randomUUID().toString().replace("-", "")); + tableEO.setItemsValId(val.getId()); + tableEO.setItemsId(itemId); + tableEO.setValidFlag(0); + tableEO.setCreationTime(new Date()); + tableEO.setModifyTime(new Date()); + tableEO.setModifyUser("yxn"); + alltableList.add(tableEO); + } + itemContent += ""; + } + } + } + if (alltableList != null && !alltableList.isEmpty()) { + sarFileSplitItemsTableEOMapper.insertForeach(alltableList); + } + } + itemContent += "
    " + tableEO.getContent() + "
    "; + return itemContent; + } + + /** + * @Author yangxuenan + * @Description 添加特殊参数要求内容 + * Date 2020/2/4 15:56 + * @Param [sarFileSplitItemsEO] + * @return void + **/ + public void addParamsContent(SarFileSplitItemsEO sarFileSplitItemsEO){ + List paramList = sarFileSplitItemsEO.getParamsList(); + if(paramList != null && !paramList.isEmpty()){ + for(SarFileSplitItemsParamsEO paramsEO : paramList){ + paramsEO.setId(UUID.randomUUID().toString().replace("-", "")); + paramsEO.setItemId(sarFileSplitItemsEO.getId()); + paramsEO.setInfoId(sarFileSplitItemsEO.getInfoId()); + paramsEO.setValidFlag(0); + paramsEO.setCreationTime(new Date()); + paramsEO.setModifyTime(new Date()); + } + sarFileSplitItemsParamsMapper.insertForeach(paramList); + } + } + + /** + * @Author yangxuenan + * @Description 修改特殊参数要求内容 + * Date 2020/2/4 15:56 + * @Param [sarFileSplitItemsEO] + * @return void + **/ + public void updateParamsContent(SarFileSplitItemsEO sarFileSplitItemsEO){ + List itemList = new ArrayList<>(); + itemList.add(sarFileSplitItemsEO.getId()); + sarFileSplitItemsParamsMapper.deleteByItemIds(itemList); + List paramList = sarFileSplitItemsEO.getParamsList(); + if(paramList != null && !paramList.isEmpty()){ + for(SarFileSplitItemsParamsEO paramsEO : paramList){ + paramsEO.setId(UUID.randomUUID().toString().replace("-", "")); + paramsEO.setItemId(sarFileSplitItemsEO.getId()); + paramsEO.setInfoId(sarFileSplitItemsEO.getInfoId()); + paramsEO.setValidFlag(0); + paramsEO.setCreationTime(new Date()); + paramsEO.setModifyTime(new Date()); + } + sarFileSplitItemsParamsMapper.insertForeach(paramList); + } + } + + public List queryByItemsIds(List idList){ + return dao.queryByItemsIds(idList); + } + + public int batchDeleteItems(String ids){ + String[] itemIds = ids.split(","); + List idList = Arrays.asList(itemIds); + // 查到对应menu + List getMenuList = dao.queryByItemsIds(idList); + List getAllItemList = new ArrayList<>(); + List getAllMenuList = new ArrayList<>(); + List menuIdList = new ArrayList<>(); + List allItemIdList = new ArrayList<>(); + int result = 0; + if (getMenuList != null && !getMenuList.isEmpty()) { + for(SarFileSplitItemsEO splitItemsEO : getMenuList){ + menuIdList.add(splitItemsEO.getMenuId()); + SarFileSplitMenuEO menuEO = new SarFileSplitMenuEO(); + menuEO.setId(splitItemsEO.getMenuId()); + //查询当前目录的所有子目录，不包括当前目录 + List menuList = sarFileSplitMenuEOMapper.queryByPidExcpetSelf(menuEO); + getAllMenuList.addAll(menuList); + //查询子目录下的所有条款，包括当前目录 + List rows = dao.queryItemsByMenuId(splitItemsEO.getMenuId()); + getAllItemList.addAll(rows); + } + if (getAllItemList != null && !getAllItemList.isEmpty()) { + //目录下没有子节点时， + if ((getAllMenuList == null || getAllMenuList.isEmpty()) && getAllItemList.size() > 1) { + // 删除val表数据 + sarFileSplitItemsValEOMapper.deleteValByitemIds(idList); + //删除table数据 + sarFileSplitItemsTableEOMapper.deleteByitemIds(idList); + //删除特殊参数要求params表数据 + sarFileSplitItemsParamsMapper.deleteByItemIds(idList); + result = dao.deleteByItemsIdList(idList); + return result; + } + for (SarFileSplitItemsEO itemsEO : getAllItemList) { + if (allItemIdList != null && !allItemIdList.contains(itemsEO.getId())) { + allItemIdList.add(itemsEO.getId()); + } else if (allItemIdList == null || allItemIdList.size() < 1) { + allItemIdList.add(itemsEO.getId()); + } + } + if (getAllMenuList != null && !getAllMenuList.isEmpty()) { + for(SarFileSplitMenuEO sarFileSplitMenuEO : getAllMenuList){ + if(!menuIdList.contains(sarFileSplitMenuEO.getId())){ + menuIdList.add(sarFileSplitMenuEO.getId()); + } + } + } + // 删除menu表数据 + sarFileSplitMenuEOMapper.deleteByIdList(menuIdList); + // 删除val表数据 + sarFileSplitItemsValEOMapper.deleteValByitemIds(allItemIdList); + //删除table数据 + sarFileSplitItemsTableEOMapper.deleteByitemIds(allItemIdList); + //删除特殊参数要求params表数据 + sarFileSplitItemsParamsMapper.deleteByItemIds(allItemIdList); + //删除res表数据 +// sarFileSplitItemsResEODao.deleteByItemIds(allItemIdList); + //删除file表数据 +// sarFileSplitItemsFileEODao.deleteByItemIds(allItemIdList); + result = dao.deleteByItemsIdList(allItemIdList); + }else { + //要删除的条款menuId均不存在，判定为垃圾数据 + + // 删除val表数据 + sarFileSplitItemsValEOMapper.deleteValByitemIds(idList); + //删除table数据 + sarFileSplitItemsTableEOMapper.deleteByitemIds(idList); + //删除特殊参数要求params表数据 + sarFileSplitItemsParamsMapper.deleteByItemIds(idList); + result = dao.deleteByItemsIdList(idList); + } + } + return result; + } + + public Map judgeContaintChilds(String ids) throws Exception { + String[] itemIds = ids.split(","); + Map result = new HashMap<>(); + List idList = Arrays.asList(itemIds); + // 查到对应menu + List getMenuList = dao.queryByItemsIds(idList); + if (getMenuList != null && !getMenuList.isEmpty()) { + for (SarFileSplitItemsEO splitItemsEO : getMenuList) { + SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO(); + sarMenuEO.setId(splitItemsEO.getMenuId()); + List list = sarFileSplitMenuEOMapper.queryByPidExcpetSelf(sarMenuEO); + if(list != null && !list.isEmpty()){ +// String menuNameStr = list.stream().map(m-> m.getName() + " " + m.getItemName()).collect(Collectors.joining("；")); + String menuNameStr = list.stream().map(SarFileSplitMenuEO :: getName).collect(Collectors.joining("；")); + result.put("flag",false); + result.put("content", menuNameStr); + return result; + } + } + } + result.put("flag",true); + return result; + } + + public List queryByOrdersForExport(SarFileSplitItemsEOPage page){ + return dao.queryByOrdersForExport(page); + } + + public List combineItemValInfo(List getValList, List allTableList, List allImgList, SarFileSplitItemsEOPage page) throws Exception{ + int tableIndex = page.getTableIndex(); + int imgIndex = page.getImgIndex(); + List valContent = new ArrayList<>(); + if (getValList != null && !getValList.isEmpty()) { + String preType = ""; + for(SarFileSplitItemsValEO itemsValEO : getValList){ + String type = itemsValEO.getType(); + FileSplitValExportDto lastOne = new FileSplitValExportDto(); + lastOne.setValType(type); + if(preType.equals(type) && "TEXT".equals(type)) { + lastOne = valContent.get(valContent.size() - 1); + lastOne.setValContent(lastOne.getValContent()+itemsValEO.getItemContent() + "\n"); + valContent.set(valContent.size() - 1, lastOne); + } else if ("TEXT".equals(type)) { + lastOne.setValContent(lastOne.getValContent()+itemsValEO.getItemContent() + "\n"); + valContent.add(lastOne); + } else if ("TABLE".equals(type)) { + String tableName = String.valueOf(tableIndex); + lastOne.setValContent("tableSheet" + tableName); + //查询table信息 + SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); + tablePage.setItemsValId(itemsValEO.getId()); + valContent.add(lastOne); +// List> tableList = combineTableList(itemsValEO); + FileSpiltValTableExportDto tableExportDto = new FileSpiltValTableExportDto(); + tableExportDto.setTableName("tableSheet" + tableName); +// tableExportDto.setTableEOList(tableList); + tableExportDto.setTableHtCon(itemsValEO.getItemContent()); + allTableList.add(tableExportDto); + tableIndex++; + page.setTableIndex(tableIndex); + } else if ("IMG".equals(type)) { + String imgContent = itemsValEO.getItemContent(); + String imgUUIndex = "img" + String.valueOf(imgIndex); + if (StringUtils.isNotEmpty(imgContent)){ + int pathIndex = imgContent.indexOf("src='uploadPath"); + if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) { + String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2); + String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length()); + lastOne.setValContent(imgUUIndex+".png"); + valContent.add(lastOne); + FileSplitValImgExportDto fileSplitValImgExportDto = new FileSplitValImgExportDto(); + fileSplitValImgExportDto.setImgName(imgUUIndex+".png"); + if (StringUtils.isNotEmpty(itemsValEO.getImgName())) { + fileSplitValImgExportDto.setImgPath(itemsValEO.getImgName()); + } else { + fileSplitValImgExportDto.setImgPath(imgPath); + } + allImgList.add(fileSplitValImgExportDto); + imgIndex++; + page.setImgIndex(imgIndex); + } + } + } + preType = itemsValEO.getType(); + } + } + return valContent; + } + + public List> combineTableList(SarFileSplitItemsValEO itemsValEO) throws Exception{ + List> tableListShow = new ArrayList<>(); + SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); + tablePage.setItemsValId(itemsValEO.getId()); + List tableList = sarFileSplitItemsTableEOMapper.queryByList(tablePage); + List tableListRow = sarFileSplitItemsTableEOMapper.queryByRowNum(tablePage); + if (tableListRow != null && !tableListRow.isEmpty()) { + for (int i=1; i <= tableListRow.size();i++) { + List rowList = new ArrayList<>(); + for (int j=0; j < tableList.size();j++) { + if (tableList.get(j).getRowNum() == i) { + rowList.add(tableList.get(j)); + } + } + tableListShow.add(rowList); + } + } + return tableListShow; + } + + public void downLoadImgList(List allImgList,String fileNowPath) throws IOException { + for(FileSplitValImgExportDto imgExportDto : allImgList){ + String oldPath = uploadFilePath+ "/" + imgExportDto.getImgPath(); + String newPath = fileNowPath + "/" + imgExportDto.getImgName(); + File oldFile = new File(oldPath); + if (oldFile.exists()){ + copyFile1(oldPath, newPath); + } + } + + } + + public void downLoadFileList(List allRelevFileList, String fileNowPath) throws IOException { + for(OSSFile fileExportDto : allRelevFileList){ + String oldPath = fileExportDto.getUrl(); + String newPath = fileNowPath + "/" + fileExportDto.getFileName(); + File oldFile = new File(oldPath); + if (oldFile.exists()){ + copyFile1(oldPath, newPath); + } + } + + } + + public void copyFile1(String srcPath, String destPath) throws IOException { + BufferedInputStream bis = new BufferedInputStream(Files.newInputStream(Paths.get(srcPath))); + BufferedOutputStream bos = + new BufferedOutputStream(Files.newOutputStream(Paths.get(destPath), + StandardOpenOption.CREATE, + StandardOpenOption.TRUNCATE_EXISTING, + StandardOpenOption.WRITE)); + // 打开输入流 +// FileInputStream fis = new FileInputStream(srcPath); + // 打开输出流 +// FileOutputStream fos = new FileOutputStream(destPath); + // 读取和写入信息 + byte[] bytes = new byte[1024 * 1024]; + int len; + while ((len = bis.read(bytes)) > 0) { + bos.write(bytes, 0, len); + } + // 关闭流 先开后关 后开先关 + bos.close(); // 后开先关 + bis.close(); // 先开后关 + + } + + public List queryByList2(SarFileSplitItemsEOPage page){ + return dao.queryByList2(page); + } + + public Result importSplitItems(List list, String menuId, String filepath, String infoId, List getSheetTableList){ + //此处需要做各种验证，数据库操作 + try { + //验证导入数据是否符合规则 + Map map = validateImportDatas(list,filepath); + boolean isOk = (boolean) map.get("result"); + if (!isOk) { + //验证没有通过 + String message = (String) map.get("message"); + return Result.error(message); + } + //将导入数据循环合并整理后 新增至相应表 + list = (List) map.get("resultList"); + int countSuccess = 0; + // 最终添加的数据 + List addItemsEOList = new ArrayList<>(); + int itemNum = 0; + for (SarFileSplitItemsImportDto importDto : list) { + //判断此行数据是否全部为空,是则不读取 + if(checkObjAllFieldsIsNull(importDto)){ + continue; + } + SarFileSplitItemsEO sarFileSplitItemsEO = new SarFileSplitItemsEO(); + BeanUtils.copyProperties(importDto, sarFileSplitItemsEO); + sarFileSplitItemsEO.setId(UUID.randomUUID().toString().replace("-", "")); + sarFileSplitItemsEO.setInfoId(infoId); + List addItemValList = new ArrayList<>(); + if (addItemsEOList != null && !addItemsEOList.isEmpty()) { + SarFileSplitItemsEO oldItems = addItemsEOList.get(addItemsEOList.size()-1); + if (itemNum > 0 && sarFileSplitItemsEO.getItemsNum().equals(oldItems.getItemsNum()) + && sarFileSplitItemsEO.getItemsName().equals(oldItems.getItemsName())) { + addItemValList = oldItems.getItemValEOList(); + String itemContent = oldItems.getItermsConditions()+sarFileSplitItemsEO.getItermsConditions(); + oldItems.setItermsConditions(itemContent); + String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n"); + if (valArr != null && valArr.length > 0) { + for (int i=0;i nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + if (nowfilelist != null && !nowfilelist.isEmpty()) { + OSSFile ossFile = new OSSFile(); + ossFile.setFileName(nowfilelist.get(0).getName()); + ossFile.setUrl(nowfilelist.get(0).getPath()); + boolean insertResult = ossFileService.save(ossFile); + if(insertResult){ + isText = false; + String path = "uploadPath" + nowfilelist.get(0).getPath(); + String imgCon = ""; + valEO.setType("IMG"); + valEO.setItemContent(imgCon); + } + } + if (isText) { + valEO.setType("TEXT"); + valEO.setItemContent(valArr[i]); + } + addItemValList.add(valEO); + } + } + oldItems.setItemValEOList(addItemValList); + }else { + String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n"); + if (valArr != null && valArr.length > 0) { + for (int i=0;i nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + if (nowfilelist != null && !nowfilelist.isEmpty()) { + OSSFile ossFile = new OSSFile(); + ossFile.setFileName(nowfilelist.get(0).getName()); + ossFile.setUrl(nowfilelist.get(0).getPath()); + boolean insertResult = ossFileService.save(ossFile); + if(insertResult){ + isText = false; + String path = "uploadPath" + nowfilelist.get(0).getPath(); + String imgCon = ""; + valEO.setType("IMG"); + valEO.setItemContent(imgCon); + } + } + if (isText) { + valEO.setType("TEXT"); + valEO.setItemContent(valArr[i]); + } + addItemValList.add(valEO); + } + } + sarFileSplitItemsEO.setItemValEOList(addItemValList); + addItemsEOList.add(sarFileSplitItemsEO); + } + } else { + String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n"); + if (valArr != null && valArr.length > 0) { + for (int i=0;i nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + if (nowfilelist != null && !nowfilelist.isEmpty()) { + OSSFile ossFile = new OSSFile(); + ossFile.setFileName(nowfilelist.get(0).getName()); + ossFile.setUrl(nowfilelist.get(0).getPath()); + boolean insertResult = ossFileService.save(ossFile); + if(insertResult){ + isText = false; + String path = "uploadPath" + nowfilelist.get(0).getPath(); + String imgCon = ""; + valEO.setType("IMG"); + valEO.setItemContent(imgCon); + } + } + if (isText) { + valEO.setType("TEXT"); + valEO.setItemContent(valArr[i]); + } + addItemValList.add(valEO); + } + } + sarFileSplitItemsEO.setItemValEOList(addItemValList); + addItemsEOList.add(sarFileSplitItemsEO); + } + itemNum++; + } + //TODO 创建树结构 + Long treeListDisplay = 1L; + //获取导入数据一级节点级数 + int levelNum = 0; + SarFileSplitMenuEO targetMenuEO = sarFileSplitMenuEOMapper.selectByPrimaryKey(menuId); + if(targetMenuEO != null){ + //判断导入节点是否有子节点 + int childrenCount = sarFileSplitMenuEOMapper.getChildrenCountByParentId(menuId); + if(childrenCount > 1){ + //获取导入节点的下一级最后一个子节点的序号 + treeListDisplay = Long.valueOf(sarFileSplitMenuEOMapper.getMaxDisplayByidNextLevel(menuId)); + }else{ + //当导入节点没有子节点时，获取当前节点的序号 + treeListDisplay = targetMenuEO.getDisplaySeq(); + } + +// if(!"总目录".equals(targetMenuEO.getName())){ +// String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化：数字和点必须交替 +// if(!targetMenuEO.getName().matches(regex)){ +// throw new AdcDaBaseException("所选目录命名不规范"); +// } +// String[] str = targetMenuEO.getName().split("."); +// if(str.length == 0){ +// levelNum = 2; +// }else { +// levelNum = str.length + 1; +// } +// }else{ +// levelNum = 1; +// } + } + + //获取导入数据的所有一级节点 + int finalLevelNum = levelNum; + /*List itemNumList = new ArrayList<>(); + for(SarFileSplitItemsEO sarFileSplitItemsEO : addItemsEOList){ + String[] str = sarFileSplitItemsEO.getItemsNum().split("."); + if(str.length == finalLevelNum){ + itemNumList.add(sarFileSplitItemsEO); + } + }*/ + List itemNumList = addItemsEOList.stream() + .filter(e->e.getItemsNum().split("\\.").length == finalLevelNum || e.getItemsNum().contains("附录")) + .collect(Collectors.toList()); + //构造目录树 + HashMap menuAndItemMap = new HashMap<>(); +// if(CollectionUtils.isNotEmpty(itemNumList)) { + List itemsEOList = new ArrayList<>(addItemsEOList); + List treeList = buildTree(itemsEOList, treeListDisplay, menuId); + String userId = UserUtils.getUserId(); + for (SarFileSplitMenuTreeNode treeNode : treeList) { + //创建菜单 + SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); + sarFileSplitMenuEO.setId(treeNode.getId()); + sarFileSplitMenuEO.setInfoId(infoId); + sarFileSplitMenuEO.setName(treeNode.getName()); + sarFileSplitMenuEO.setItemName(treeNode.getItemName()); + sarFileSplitMenuEO.setPId(treeNode.getParentId()); + sarFileSplitMenuEO.setDisplaySeq(treeNode.getOrderNum()); + sarFileSplitMenuEO.setCreationUser(userId); + sarFileSplitMenuEO.setModifyUser(userId); + sarFileSplitMenuEO.setValidFlag(0); + sarFileSplitMenuEO.setCreationTime(new Date()); + sarFileSplitMenuEO.setModifyTime(new Date()); + sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO); + menuAndItemMap.put(treeNode.getItemId(), treeNode.getId()); + } +// }else{ +// throw new AdcDaBaseException("导入目录命名不规范"); +// } + //添加条款 + for (SarFileSplitItemsEO itemsEO : addItemsEOList) { + if(menuAndItemMap.get(itemsEO.getId()) != null) { + createItemsInfo(itemsEO, menuAndItemMap.get(itemsEO.getId()), infoId); + } + countSuccess++; + } + //导入之后的节点（包括子节点），序号加一 + SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage(); + page.setInfoId(targetMenuEO.getInfoId()); + page.setValidFlag("0"); + page.setOrderBy("display_seq asc"); + List getList = sarFileSplitMenuEOMapper.queryByList(page); + if (getList != null && !getList.isEmpty()) { + //除去导入节点 + for(SarFileSplitMenuEO menu : getList){ + if(menuAndItemMap.containsValue(menu.getId())){ + continue; + } + if(targetMenuEO.getId().equals(menu.getId())){ + continue; + } + Long oldSeq = menu.getDisplaySeq(); + if (oldSeq > treeListDisplay) { + menu.setDisplaySeq(oldSeq + countSuccess); + sarFileSplitMenuEOMapper.updateByPrimaryKeySelective(menu); + } + } + } + String msg = "成功导入" + countSuccess + "条"; + return Result.OK( msg,null); + } catch (Exception e) { + logger.error(e.getMessage(),e); + return Result.error("导入失败"); + } + } + + public List buildTree(List addItemsEOList, Long treeListDisplay, String menuId){ + //排序 + Collections.sort(addItemsEOList, new Comparator() { + @Override + public int compare(SarFileSplitItemsEO o1, SarFileSplitItemsEO o2) { + return o1.getItemsNum().compareTo(o2.getItemsNum()); + } + }); + + List treeNodeList = new ArrayList<>(); + String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化：数字和点必须交替 + for (SarFileSplitItemsEO itemEO : addItemsEOList) { + String itemNum = itemEO.getItemsNum(); + if(itemNum.matches(regex) || itemNum.contains("附录")) { + SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode(); + treeNode.setId(UUID.randomUUID().toString().replace("-", "")); + treeNode.setName(itemNum); + if(itemNum.matches(regex)) { + //父级是 总目录时，不做处理 + if(itemNum.contains(".")) { + String parentName = itemNum.substring(0, itemNum.lastIndexOf(".")); + treeNode.setParentName(parentName); + List p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(p)) { + //其他节点 + treeNode.setParentId(p.get(0).getId()); + }else{ + //一级节点 + treeNode.setParentId(menuId); + } + }else{ + treeNode.setParentId(menuId); + } + }else{ + treeNode.setParentId(menuId); + } + ++treeListDisplay; + treeNode.setOrderNum(treeListDisplay); + treeNode.setItemName(itemEO.getItemsName()); + treeNode.setItemId(itemEO.getId()); + treeNodeList.add(treeNode); + } + } + //其他节点 + /*for (SarFileSplitItemsEO itemEO : addItemsEOList) { + String itemNum = itemEO.getItemsNum(); + if (itemNum.matches(regex)) { + SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode(); + String parentName = itemNum.substring(0, itemNum.lastIndexOf(".")); + List p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(p)) { + treeNode.setParentId(p.get(0).getId()); + } + treeNode.setId(UUID.randomUUID().toString().replace("-", "")); + treeNode.setName(itemNum); + treeNode.setParentName(parentName); + //判断格式 + if (itemNum.lastIndexOf(".") + 1 < itemNum.length()) { +// treeNode.setOrderNum(Long.valueOf(itemNum.substring(itemNum.lastIndexOf(".") + 1, itemNum.length()))); + treeNode.setOrderNum(p.get(0).getOrderNum() + Long.valueOf(itemNum.substring(itemNum.lastIndexOf(".") + 1, itemNum.length()))); + } + + treeNode.setItemName(itemEO.getItemsName()); + treeNode.setItemId(itemEO.getId()); + treeNodeList.add(treeNode); + } + }*/ + + return treeNodeList; + } + + public Map validateImportDatas(List datas, String filepath) throws Exception { + //存放数据验证结果信息 + List stringMessage = new ArrayList<>(); + int i = 1; //记录行号 + int num = 0; //记录是第几条数据 + //循环验证数据 + for (SarFileSplitItemsImportDto dto : datas) { + i++; + int countError = 0; //记录失败数据数量 + String errorMsg = "第" + i + "行："; + dto.setRelevanceFileName(dto.getRelevanceFile()); + if (num > 0 && StringUtils.isEmpty(dto.getItemsNum()) && StringUtils.isEmpty(dto.getItemsName())) { + String nowItemContent = dto.getItermsConditions(); + BeanUtils.copyProperties(datas.get(num-1), dto); + dto.setItermsConditions(nowItemContent); + dto.setRelevanceFile(dto.getRelevanceFileName()); + } + if (StringUtils.isEmpty(dto.getItemsNum())) { + errorMsg += "条款号不能为空;"; + countError++; + } else { + if (dto.getItemsNum().length()>100) { + errorMsg += "条款号不能超过100个字符;"; + countError++; + } + } + if (StringUtils.isEmpty(dto.getItemsName())) { + errorMsg += "条款名称不能为空;"; + countError++; + } else { + if (dto.getItemsName().length()>100) { + errorMsg += "条款名称不能超过100个字符;"; + countError++; + } + } + String saveApplyCode = ""; + if (StringUtils.isNotEmpty(dto.getApplyArctic())) { + dto.setApplyArctic(dto.getApplyArctic().replace("，", ",")); + String applys[] = dto.getApplyArctic().split(","); + if(applys.length>20){ + errorMsg += "适用车型选项不能超过20个;"; + countError++; + } else if (dto.getApplyArctic().length() > 500) { + errorMsg += "适用车型不能超过500个字符;"; + countError++; + } else { + Set set = new HashSet(); + for (int a = 0; a < applys.length; a++) { + String getDic = sysDictMapper.queryDictKeyByText("PRODUCTTYPE", applys[a]);; + if (getDic != null) { + saveApplyCode += getDic + ","; + } else { + errorMsg += "适用车型" + applys[a] + "不存在;"; + countError++; + break; + } + set.add(applys[a]); + if (a==applys.length-1 && applys.length != set.size()){ + errorMsg += "适用车型存在重复数据;"; + countError++; + } + } + if (!saveApplyCode.equals("")){ + dto.setApplyArctic(saveApplyCode.substring(0,saveApplyCode.length()-1)); + } + } + } + //关联文件 支持PDF、doc、docx文件， + if (StringUtils.isNotEmpty(dto.getRelevanceFile())) { + dto.setRelevanceFile(dto.getRelevanceFile().replace("，", ",")); + String[] filelist = dto.getRelevanceFile().split(","); + String fileidlist = ""; + if (filelist != null && filelist.length > 8) { + errorMsg += "关联文件不能超过8个"; + countError++; + } else { + for (int ind = 0; ind < filelist.length; ind++) { + String filename = filelist[ind]; + String resultMes = ExcelUtil.validatePattern(filename); + if (StringUtils.isNotEmpty(resultMes)) { + errorMsg += "关联文件" + resultMes; + countError++; + continue; + } + List nowfilelist = FileUnZip.readFileByFilename(filepath, filename); + if (nowfilelist.size() <= 0) { + errorMsg += "压缩包中没有关联文件" + filename + "文件;"; + countError++; + } else { + // 判断文件大小是否超过200M + if (nowfilelist.get(0).length() > 200 * 1024 * 1024) { + errorMsg += filename + "文件大小超过200M;"; + countError++; + continue; + } + OSSFile ossFile = new OSSFile(); + String id = UUID.randomUUID().toString().replace("-", ""); + ossFile.setId(id); + ossFile.setFileName(nowfilelist.get(0).getName()); + ossFile.setUrl(nowfilelist.get(0).getPath()); + boolean insertResult = ossFileService.save(ossFile); + if(insertResult){ + fileidlist += id + ","; + } + } + } + if (fileidlist != "") { + dto.setRelevanceFile(fileidlist.substring(0, fileidlist.length() - 1)); + } + } + } + if (countError > 0) { + stringMessage.add(errorMsg); + } + num++; + } + Map map = new HashMap(); + if (stringMessage.isEmpty()) { + map.put("result", true); + map.put("resultList", datas); + map.put("message", ""); + } else { + map.put("result", false); + String html = ""; + for (String message : stringMessage) { + html += message + "
    "; + } + map.put("message", html); + } + return map; + } + + public void createItemsInfo(SarFileSplitItemsEO sarFileSplitItemsEO,String menuId,String infoId){ + String userId = UserUtils.getUserId(); + //创建菜单 +// SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); +// sarFileSplitMenuEO.setInfoId(infoId); +// sarFileSplitMenuEO.setName(sarFileSplitItemsEO.getItemsNum()); +// sarFileSplitMenuEO.setItemName(sarFileSplitItemsEO.getItemsName()); +// sarFileSplitMenuEO.setPId(parentId); +// sarFileSplitMenuEO.setDisplaySeq(countNum+1L); +// sarFileSplitMenuEO.setCreationUser(userId); +// sarFileSplitMenuEO.setModifyUser(userId); +// String menuId = sarFileSplitMenuEOService.addMenuForImport(sarFileSplitMenuEO); + //添加items表数据 +// String itemsId = UUID.randomUUID().toString().replace("-", ""); +// sarFileSplitItemsEO.setId(itemsId); + sarFileSplitItemsEO.setMenuId(menuId); + sarFileSplitItemsEO.setValidFlag(0); + sarFileSplitItemsEO.setCreationTime(new Date()); + sarFileSplitItemsEO.setModifyTime(new Date()); + sarFileSplitItemsEO.setCreationUser(userId); + + //添加val表数据 + List getValList = sarFileSplitItemsEO.getItemValEOList(); + String itemConditions = ""; + int ind = 1; + if (getValList != null && !getValList.isEmpty()) { + for (SarFileSplitItemsValEO valEO : getValList) { + // 当前段内容 + String valContent = ""; + if ("TEXT".equals(valEO.getType())) { + valContent += "

    " + valEO.getItemContent() + "

    "; + } else if ("IMG".equals(valEO.getType())) { +// valContent += ""; + valContent += valEO.getItemContent(); + } else if ("TABLE".equals(valEO.getType())) { + valContent += valEO.getItemContent(); + } + itemConditions += valContent; + // val表信息 + valEO.setId(UUID.randomUUID().toString().replace("-", "")); +// valEO.setItemId(itemsId); + valEO.setItemId(sarFileSplitItemsEO.getId()); + valEO.setDisplaySeq(ind); + valEO.setValidFlag(0); + valEO.setCreationTime(new Date()); + valEO.setModifyTime(new Date()); + valEO.setCreationUser(userId); + valEO.setModifyUser(userId); + ind++; + } + sarFileSplitItemsValEOMapper.insertForeach(getValList); + sarFileSplitItemsEO.setItermsConditions(itemConditions); + } + dao.insertSelective(sarFileSplitItemsEO); + } + + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsFileEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsFileEOServiceImpl.java new file mode 100644 index 000000000..65fd35837 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsFileEOServiceImpl.java @@ -0,0 +1,84 @@ +package com.jero.modules.split.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.split.entity.SarFileSplitItemsFileEO; +import com.jero.modules.split.mapper.SarFileSplitItemsFileEOMapper; +import com.jero.modules.split.page.SarFileSplitItemsFileEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsFileEOService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_FILE SarFileSplitItemsFileEOService
    + * 作者：code generator
    + * 日期： 2020-03-30
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("sarFileSplitItemsFileEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitItemsFileEOServiceImpl extends ServiceImpl implements ISarFileSplitItemsFileEOService { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsFileEOServiceImpl.class); + + @Autowired + private SarFileSplitItemsFileEOMapper dao; + + public List selectFileByAttId(String attId){ + return dao.selectFileByAttId(attId); + } + + @Override + public int insert(SarFileSplitItemsFileEO sarFileSplitItemsFileEO) { + return dao.insert(sarFileSplitItemsFileEO); + } + + @Override + public int insertSelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO) { + return dao.insertSelective(sarFileSplitItemsFileEO); + } + + @Override + public int updateByPrimaryKey(SarFileSplitItemsFileEO sarFileSplitItemsFileEO) { + return dao.updateByPrimaryKey(sarFileSplitItemsFileEO); + } + + @Override + public int updateByPrimaryKeySelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO) { + return dao.updateByPrimaryKeySelective(sarFileSplitItemsFileEO); + } + + @Override + public SarFileSplitItemsFileEO selectByPrimaryKey(String value) { + return dao.selectByPrimaryKey(value); + } + + @Override + public int deleteByPrimaryKey(String value) { + return dao.deleteByPrimaryKey(value); + } + + @Override + public List queryByList(SarFileSplitItemsFileEOPage page) { + return dao.queryByList(page); + } + + @Override + public int queryByCount(SarFileSplitItemsFileEOPage page) { + return dao.queryByCount(page); + } + + @Override + public List queryByPage(SarFileSplitItemsFileEOPage page) { + return dao.queryByPage(page); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsParamsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsParamsEOServiceImpl.java new file mode 100644 index 000000000..f41a137df --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsParamsEOServiceImpl.java @@ -0,0 +1,84 @@ +package com.jero.modules.split.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.split.entity.SarFileSplitItemsParamsEO; +import com.jero.modules.split.mapper.SarFileSplitItemsParamsMapper; +import com.jero.modules.split.page.SarFileSplitItemsParamsEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsParamsEOService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOService
    + * 作者：code generator
    + * 日期： 2020-02-04
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("sarFileSplitItemsParamsEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitItemsParamsEOServiceImpl extends ServiceImpl implements ISarFileSplitItemsParamsEOService { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsParamsEOServiceImpl.class); + + @Autowired + private SarFileSplitItemsParamsMapper dao; + + public int deleteByItemIds(List idList){ + return dao.deleteByItemIds(idList); + } + + @Override + public int insert(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) { + return dao.insert(sarFileSplitItemsParamsEO); + } + + @Override + public int insertSelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) { + return dao.insertSelective(sarFileSplitItemsParamsEO); + } + + @Override + public int updateByPrimaryKey(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) { + return dao.updateByPrimaryKey(sarFileSplitItemsParamsEO); + } + + @Override + public int updateByPrimaryKeySelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) { + return dao.updateByPrimaryKeySelective(sarFileSplitItemsParamsEO); + } + + @Override + public SarFileSplitItemsParamsEO selectByPrimaryKey(String value) { + return dao.selectByPrimaryKey(value); + } + + @Override + public int deleteByPrimaryKey(String value) { + return dao.deleteByPrimaryKey(value); + } + + @Override + public List queryByList(SarFileSplitItemsParamsEOPage page) { + return dao.queryByList(page); + } + + @Override + public int queryByCount(SarFileSplitItemsParamsEOPage page) { + return dao.queryByCount(page); + } + + @Override + public List queryByPage(SarFileSplitItemsParamsEOPage page) { + return dao.queryByPage(page); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsResEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsResEOServiceImpl.java new file mode 100644 index 000000000..ba1ce653a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsResEOServiceImpl.java @@ -0,0 +1,80 @@ +package com.jero.modules.split.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.split.entity.SarFileSplitItemsResEO; +import com.jero.modules.split.mapper.SarFileSplitItemsResEOMapper; +import com.jero.modules.split.page.SarFileSplitItemsResEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsResEOService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_RES SarFileSplitItemsResEOService
    + * 作者：code generator
    + * 日期： 2020-03-30
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("sarFileSplitItemsResEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitItemsResEOServiceImpl extends ServiceImpl implements ISarFileSplitItemsResEOService { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsResEOServiceImpl.class); + + @Autowired + private SarFileSplitItemsResEOMapper dao; + + + @Override + public int insert(SarFileSplitItemsResEO sarFileSplitItemsResEO) { + return dao.insert(sarFileSplitItemsResEO); + } + + @Override + public int insertSelective(SarFileSplitItemsResEO sarFileSplitItemsResEO) { + return dao.insertSelective(sarFileSplitItemsResEO); + } + + @Override + public int updateByPrimaryKey(SarFileSplitItemsResEO sarFileSplitItemsResEO) { + return dao.updateByPrimaryKey(sarFileSplitItemsResEO); + } + + @Override + public int updateByPrimaryKeySelective(SarFileSplitItemsResEO sarFileSplitItemsResEO) { + return dao.updateByPrimaryKeySelective(sarFileSplitItemsResEO); + } + + @Override + public SarFileSplitItemsResEO selectByPrimaryKey(String value) { + return dao.selectByPrimaryKey(value); + } + + @Override + public int deleteByPrimaryKey(String value) { + return dao.deleteByPrimaryKey(value); + } + + @Override + public List queryByList(SarFileSplitItemsResEOPage page) { + return dao.queryByList(page); + } + + @Override + public int queryByCount(SarFileSplitItemsResEOPage page) { + return dao.queryByCount(page); + } + + @Override + public List queryByPage(SarFileSplitItemsResEOPage page) { + return dao.queryByPage(page); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsTableEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsTableEOServiceImpl.java new file mode 100644 index 000000000..6f1f22ca2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsTableEOServiceImpl.java @@ -0,0 +1,87 @@ +package com.jero.modules.split.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.split.entity.SarFileSplitItemsTableEO; +import com.jero.modules.split.mapper.SarFileSplitItemsTableEOMapper; +import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsTableEOService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEOService
    + * 作者：code generator
    + * 日期： 2020-01-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("sarFileSplitItemsTableEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitItemsTableEOServiceImpl extends ServiceImpl implements ISarFileSplitItemsTableEOService { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsTableEOServiceImpl.class); + + @Autowired + private SarFileSplitItemsTableEOMapper dao; + + public List queryByRowNum(SarFileSplitItemsTableEOPage page){ + return dao.queryByRowNum(page); + } + + public int deleteByitemIds(List idList){ + return dao.deleteByitemIds(idList); + } + + @Override + public int insert(SarFileSplitItemsTableEO sarFileSplitItemsTableEO) { + return dao.insert(sarFileSplitItemsTableEO); + } + + @Override + public int insertSelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO) { + return dao.insertSelective(sarFileSplitItemsTableEO); + } + + @Override + public int updateByPrimaryKey(SarFileSplitItemsTableEO sarFileSplitItemsTableEO) { + return dao.updateByPrimaryKey(sarFileSplitItemsTableEO); + } + + @Override + public int updateByPrimaryKeySelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO) { + return dao.updateByPrimaryKeySelective(sarFileSplitItemsTableEO); + } + + @Override + public SarFileSplitItemsTableEO selectByPrimaryKey(String value) { + return dao.selectByPrimaryKey(value); + } + + @Override + public int deleteByPrimaryKey(String value) { + return dao.deleteByPrimaryKey(value); + } + + @Override + public List queryByList(SarFileSplitItemsTableEOPage page) { + return dao.queryByList(page); + } + + @Override + public int queryByCount(SarFileSplitItemsTableEOPage page) { + return dao.queryByCount(page); + } + + @Override + public List queryByPage(SarFileSplitItemsTableEOPage page) { + return dao.queryByPage(page); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsValEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsValEOServiceImpl.java new file mode 100644 index 000000000..8ee781622 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsValEOServiceImpl.java @@ -0,0 +1,140 @@ +package com.jero.modules.split.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.split.entity.SarFileSplitItemsEO; +import com.jero.modules.split.entity.SarFileSplitItemsTableEO; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.mapper.SarFileSplitItemsEOMapper; +import com.jero.modules.split.mapper.SarFileSplitItemsTableEOMapper; +import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper; +import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; +import com.jero.modules.split.service.ISarFileSplitItemsValEOService; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_ITEMS_VAL SarFileSplitItemsValEOService
    + * 作者：code generator
    + * 日期： 2020-01-07
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("sarFileSplitItemsValEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitItemsValEOServiceImpl extends ServiceImpl implements ISarFileSplitItemsValEOService { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsValEOServiceImpl.class); + + @Autowired + private SarFileSplitItemsValEOMapper dao; + + @Autowired + private SarFileSplitItemsEOMapper sarFileSplitItemsEOMapper; + + @Autowired + private SarFileSplitItemsTableEOMapper sarFileSplitItemsTableEOMapper; + + public int deleteValByitemIds(List idList){ + return dao.deleteValByitemIds(idList); + } + + public List getSplitItemsByMenu(String menuId,String infoId){ + List rows = sarFileSplitItemsEOMapper.queryItemsByMenuId(menuId);; + List getList = new ArrayList<>(); + if (rows != null && !rows.isEmpty()) { + for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { + SarFileSplitItemsValEOPage valpage = new SarFileSplitItemsValEOPage(); + valpage.setItemId(sarFileSplitItemsEO.getId()); + valpage.setOrderBy("DISPLAY_SEQ,ID"); + List getListVal = dao.queryByList(valpage); + if (getList != null && !getList.isEmpty()) { + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) { + String imgPath = sarFileSplitItemsValEO.getItemContent(); + if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) { + String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length()); + sarFileSplitItemsValEO.setImgName(imgName); + } else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) { + SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); + tablePage.setItemsValId(sarFileSplitItemsValEO.getId()); + List tableList = sarFileSplitItemsTableEOMapper.queryByList(tablePage); + List tableListRow = sarFileSplitItemsTableEOMapper.queryByRowNum(tablePage); + sarFileSplitItemsValEO.setTableList(tableList); + if (tableListRow != null && !tableListRow.isEmpty()) { + List> getTableList = new ArrayList<>(); + for (int i=1; i <= tableListRow.size();i++) { + List rowList = new ArrayList<>(); + for (int j=0; j < tableList.size();j++) { + if (tableList.get(j).getRowNum() == i) { + rowList.add(tableList.get(j)); + } + } + getTableList.add(rowList); + } + sarFileSplitItemsValEO.setTableListShow(getTableList); + } + } + } + } + getList.addAll(getListVal); + } + } + return getList; + } + + @Override + public int insert(SarFileSplitItemsValEO sarFileSplitItemsValEO) { + return dao.insert(sarFileSplitItemsValEO); + } + + @Override + public int insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO) { + return dao.insertSelective(sarFileSplitItemsValEO); + } + + @Override + public int updateByPrimaryKey(SarFileSplitItemsValEO sarFileSplitItemsValEO) { + return dao.updateByPrimaryKey(sarFileSplitItemsValEO); + } + + @Override + public int updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO) { + return dao.updateByPrimaryKeySelective(sarFileSplitItemsValEO); + } + + @Override + public SarFileSplitItemsValEO selectByPrimaryKey(String value) { + return dao.selectByPrimaryKey(value); + } + + @Override + public int deleteByPrimaryKey(String value) { + return dao.deleteByPrimaryKey(value); + } + + @Override + public List queryByList(SarFileSplitItemsValEOPage page) { + return dao.queryByList(page); + } + + @Override + public int queryByCount(SarFileSplitItemsValEOPage page) { + return dao.queryByCount(page); + } + + @Override + public List queryByPage(SarFileSplitItemsValEOPage page) { + return dao.queryByPage(page); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java new file mode 100644 index 000000000..eb0c1fcb0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -0,0 +1,519 @@ +package com.jero.modules.split.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.split.entity.*; +import com.jero.modules.split.mapper.*; +import com.jero.modules.split.page.SarFileSplitItemsEOPage; +import com.jero.modules.split.page.SarFileSplitMenuEOPage; +import com.jero.modules.split.service.ISarFileSplitMenuEOService; +import com.jero.modules.system.util.UserUtils; +import org.apache.shiro.SecurityUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + + +/** + * + *
    + * 功能：SAR_FILE_SPLIT_MENU SarFileSplitMenuEOService
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("sarFileSplitMenuEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitMenuEOServiceImpl extends ServiceImpl implements ISarFileSplitMenuEOService { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitMenuEOServiceImpl.class); + + @Autowired + private SarFileSplitMenuEOMapper dao; + + @Autowired + private SarFileSplitItemsEOMapper sarFileSplitItemsEOMapper; + + @Autowired + private SarFileSplitItemsValEOMapper sarFileSplitItemsValEOMapper; + + @Autowired + private SarFileSplitItemsTableEOMapper sarFileSplitItemsTableEOMapper; + + @Autowired + private SarFileSplitItemsParamsMapper sarFileSplitItemsParamsMapper; + + public int dragMenu(DrageMenuEO drageMenuEO){ + + SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); + sarFileSplitMenuEO.setInfoId(drageMenuEO.getInfoId()); + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + sarFileSplitMenuEO.setModifyUser(loginUser.getId()); + sarFileSplitMenuEO.setModifyTime(new Date()); + sarFileSplitMenuEO.setId(drageMenuEO.getMenuId()); + int result = 0; + + + if (drageMenuEO.getMoveType().equals("inner")) { + sarFileSplitMenuEO.setPId(drageMenuEO.getTargetMenuId()); + if (drageMenuEO.getMenuDisplay()>drageMenuEO.getTargetMenuDisplay()) { + // 修改被影响的其他节点的排序，修改时间，修改人 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getTargetMenuDisplay()+1); + sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay()); + result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = drageMenuEO.getMenuDisplay()-drageMenuEO.getTargetMenuDisplay()-1; + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(loginUser.getId()); + result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO); + } + sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()+1); + } else { + // 修改被影响的其他节点的排序，修改时间，修改人 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getMenuDisplay()+childrenCount-1); + sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getTargetMenuDisplay()); + result += dao.updateDisplaySeqCut(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = drageMenuEO.getTargetMenuDisplay()-childrenCount+1- drageMenuEO.getMenuDisplay(); + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(loginUser.getId()); + result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO); + } + sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()-childrenCount+1); + } + } else if (drageMenuEO.getMoveType().equals("prev")) { + sarFileSplitMenuEO.setPId(drageMenuEO.getTargetParentId()); + if (drageMenuEO.getMenuDisplay()>drageMenuEO.getTargetMenuDisplay()) { + // 修改被影响的其他节点的排序，修改时间，修改人 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getTargetMenuDisplay()); + sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay()); + result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = drageMenuEO.getMenuDisplay()-drageMenuEO.getTargetMenuDisplay(); + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(loginUser.getId()); + result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO); + } + sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()); + } else { + // 修改被影响的其他节点的排序，修改时间，修改人 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getMenuDisplay()+childrenCount-1); + sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getTargetMenuDisplay()-1); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + result += dao.updateDisplaySeqCut(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = drageMenuEO.getTargetMenuDisplay()- childrenCount - drageMenuEO.getMenuDisplay(); + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(loginUser.getId()); + result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO); + } + + sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()-childrenCount); + } + + } else { + sarFileSplitMenuEO.setPId(drageMenuEO.getTargetParentId()); + if (drageMenuEO.getMenuDisplay()>drageMenuEO.getTargetMenuDisplay()) { + // 修改被影响的其他节点的排序，修改时间，修改人 往上移动 + // 查询目标最大的排序 + long targetDisplay = getMaxDisplayByid(drageMenuEO.getTargetMenuId()); + // 查询移动节点包括子节点一共有多少个 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setDisplaySeqStart(targetDisplay+1); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay()); + result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = drageMenuEO.getMenuDisplay()-targetDisplay-1; + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(loginUser.getId()); + result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO); + } + sarFileSplitMenuEO.setDisplaySeq(targetDisplay+1); + } else { + // 修改被影响的其他节点的排序，修改时间，修改人 往下移动 + // 如果该节点下有字节点，寻找该节点包括所有子节点的最大排序 + // 查询目标最大的排序 + long targetDisplay = getMaxDisplayByid(drageMenuEO.getTargetMenuId()); + long menuMaxDisplay = getMaxDisplayByid(drageMenuEO.getMenuId()); + // 查询移动节点包括子节点一共有多少个 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setDisplaySeqStart(menuMaxDisplay); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + sarFileSplitMenuEO.setDisplaySeqEnd(targetDisplay); + result += dao.updateDisplaySeqCut(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = targetDisplay-childrenCount+1 - drageMenuEO.getMenuDisplay(); + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(loginUser.getId()); + result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO); + } + sarFileSplitMenuEO.setDisplaySeq(targetDisplay-childrenCount+1); + // 修改字节的的排序 + } + } + // 修改当前节点，父亲Id，排序，修改时间，修改人 + result += dao.updateByPrimaryKeySelective(sarFileSplitMenuEO); + return result; + } + + // 通过ID查询该结点及结点下所有的节点排序的最大值 + public int getMaxDisplayByid(String menuID) { + return dao.getMaxDisplayByid(menuID); + } + + public int addMenu(SarFileSplitMenuEO sarFileSplitMenuEO){ + sarFileSplitMenuEO.setId(UUID.randomUUID().toString().replace("-", "")); + sarFileSplitMenuEO.setValidFlag(0); + sarFileSplitMenuEO.setCreationTime(new Date()); + sarFileSplitMenuEO.setModifyTime(new Date()); + int count = dao.insertSelective(sarFileSplitMenuEO); + // 之后的所有节点序号增加 + SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage(); + page.setPId(sarFileSplitMenuEO.getPId()); + List getList = dao.queryByList(page); + if (getList != null && !getList.isEmpty()) { + for(SarFileSplitMenuEO menu : getList){ + Long olgSeq = menu.getDisplaySeq(); + if (olgSeq >= sarFileSplitMenuEO.getDisplaySeq()) { + menu.setDisplaySeq(olgSeq + 1); + dao.updateByPrimaryKeySelective(menu); + } + } + } + return count; + } + + public boolean judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception { + boolean result = false; //true 表示有记录，false表示无记录 + //先判断目录下是否有子节点 + List list = dao.queryByPidExcpetSelf(sarMenuEO); + if(list.size()<=0){ + //再查节点下是否有标准，法规，企业标准记录 + SarFileSplitItemsEOPage itemEO = new SarFileSplitItemsEOPage(); + itemEO.setMenuId(sarMenuEO.getId()); + itemEO.setValidFlag("0"); + List listresult = sarFileSplitItemsEOMapper.queryByList(itemEO); + if(listresult !=null && listresult.size()>0){ + result=true; + } + } + else{ + result=true; + } + return result; + } + + public void deleteMenu(String id){ + List menuIds = new ArrayList<>(); + menuIds.add(id); +// dao.deleteByPrimaryKey(id); + // 删除节点及子节点 + dao.deleteByPId(id); + // 删除条款 + SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO(); + sarMenuEO.setId(id); + List list = dao.queryByPidExcpetSelf(sarMenuEO); + if (list != null && !list.isEmpty()) { + for(SarFileSplitMenuEO menu : list){ + menuIds.add(menu.getId()); + } + } + sarFileSplitItemsValEOMapper.deleteValByMenuIds(menuIds); + sarFileSplitItemsTableEOMapper.deleteTableByMenuIds(menuIds); + sarFileSplitItemsEOMapper.deleteByMenuIds(menuIds); + } + + public int copyMenu (SarFileSplitMenuEO sarMenuEO) { + int result = 0; + // 用来存放item的新旧ID，key：旧ID，value：新ID + Map itemIdMap = new HashMap<>(); + List oldItemIdList = new ArrayList<>(); + Map itemValIdMap = new HashMap<>(); + Map menuIdMap = new HashMap<>(); + // 根据目录ID查询相关信息 + sarMenuEO = dao.selectByPrimaryKey(sarMenuEO.getId()); + // 查询该节点下所有的 子节点 并修改排序 + List sarFileSplitMenuEOList = dao.queryAllChildrenByid(sarMenuEO); + int maxDisplay = dao.getMaxDisplayByid(sarMenuEO.getId()); + SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); + sarFileSplitMenuEO.setDisplaySeqStart(Long.valueOf(maxDisplay + 1)); + sarFileSplitMenuEO.setDisplaySeqEnd(10000L); + sarFileSplitMenuEO.setChildrenCount(Long.valueOf(sarFileSplitMenuEOList.size())); + sarFileSplitMenuEO.setModifyUser(UserUtils.getUserId()); + sarFileSplitMenuEO.setModifyTime(new Date()); + sarFileSplitMenuEO.setInfoId(sarMenuEO.getInfoId()); + dao.updateDisplaySeqAdd(sarFileSplitMenuEO); + for (SarFileSplitMenuEO sarFileSplitMenuEOfor : sarFileSplitMenuEOList) { + menuIdMap.put(sarFileSplitMenuEOfor.getId(),UUID.randomUUID().toString().replace("-", "")); + } + for (SarFileSplitMenuEO sarFileSplitMenuEOfor : sarFileSplitMenuEOList) { + sarFileSplitMenuEOfor.setId(menuIdMap.get(sarFileSplitMenuEOfor.getId()).toString()); + if (menuIdMap.containsKey(sarFileSplitMenuEOfor.getpId())){ + sarFileSplitMenuEOfor.setpId(menuIdMap.get(sarFileSplitMenuEOfor.getpId()).toString()); + } + sarFileSplitMenuEOfor.setDisplaySeq(sarFileSplitMenuEOfor.getDisplaySeq() + sarFileSplitMenuEOList.size()); + sarFileSplitMenuEOfor.setCreationTime(new Date()); + sarFileSplitMenuEOfor.setModifyTime(new Date()); + sarFileSplitMenuEOfor.setCreationUser(UserUtils.getUserId()); + sarFileSplitMenuEOfor.setModifyUser(UserUtils.getUserId()); + } + // SAR_FILE_ITEMS_MENU 添加数据， + result = dao.insertForeach(sarFileSplitMenuEOList); + // SAR_FILE_ITEMS 添加数据， + List sarFileSplitItemsEOList = sarFileSplitItemsEOMapper.queryItemsByMenuId(sarMenuEO.getId()); + for (SarFileSplitItemsEO sarFileSplitItemsEO : sarFileSplitItemsEOList) { + String newItemId = UUID.randomUUID().toString().replace("-", ""); + oldItemIdList.add(sarFileSplitItemsEO.getId()); + itemIdMap.put(sarFileSplitItemsEO.getId(), newItemId); + sarFileSplitItemsEO.setId(newItemId); + sarFileSplitItemsEO.setMenuId(menuIdMap.get(sarFileSplitItemsEO.getMenuId()).toString()); + sarFileSplitItemsEO.setCreationTime(new Date()); + sarFileSplitItemsEO.setModifyTime(new Date()); + sarFileSplitItemsEO.setCreationUser(UserUtils.getUserId()); + sarFileSplitItemsEO.setModifyUser(UserUtils.getUserId()); + } + if(sarFileSplitItemsEOList.size()>0){ + result += sarFileSplitItemsEOMapper.insertForeach(sarFileSplitItemsEOList); + } + + // SAR_FILE_ITEMS_VAL 添加数据， + if(oldItemIdList.size()>0){ + List sarFileSplitItemsValEOList = sarFileSplitItemsValEOMapper.queryItemsValByMenuId(oldItemIdList); + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : sarFileSplitItemsValEOList) { + String newItemValId = UUID.randomUUID().toString().replace("-", ""); + itemValIdMap.put(sarFileSplitItemsValEO.getId(), newItemValId); + sarFileSplitItemsValEO.setId(newItemValId); + sarFileSplitItemsValEO.setItemId(itemIdMap.get(sarFileSplitItemsValEO.getItemId()).toString()); + sarFileSplitItemsValEO.setCreationTime(new Date()); + sarFileSplitItemsValEO.setModifyTime(new Date()); + sarFileSplitItemsValEO.setCreationUser(UserUtils.getUserId()); + sarFileSplitItemsValEO.setModifyUser(UserUtils.getUserId()); + } + if (sarFileSplitItemsValEOList.size()>0) { + result += sarFileSplitItemsValEOMapper.insertForeach(sarFileSplitItemsValEOList); + } + // SAR_FILE_ITEMS_PARAMS 添加数据， + List sarFileSplitItemsParamsEOList = sarFileSplitItemsParamsMapper.queryItemsParamsByMenuId(oldItemIdList); + for (SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO : sarFileSplitItemsParamsEOList) { + sarFileSplitItemsParamsEO.setId(UUID.randomUUID().toString().replace("-", "")); + sarFileSplitItemsParamsEO.setItemId(itemIdMap.get(sarFileSplitItemsParamsEO.getItemId()).toString()); + sarFileSplitItemsParamsEO.setCreationTime(new Date()); + sarFileSplitItemsParamsEO.setModifyTime(new Date()); + } + if (sarFileSplitItemsParamsEOList.size()>0){ + result += sarFileSplitItemsParamsMapper.insertForeach(sarFileSplitItemsParamsEOList); + } + } + + + // SAR_FILE_ITEMS_TABLE 添加数据， +// List sarFileSplitItemsTableEOList = sarFileSplitItemsTableEODao.queryItemsTableByMenuId(oldItemIdList); +// for (SarFileSplitItemsTableEO sarFileSplitItemsTableEO : sarFileSplitItemsTableEOList) { +// sarFileSplitItemsTableEO.setId(UUID.randomUUID().toString().replace("-", "")); +// sarFileSplitItemsTableEO.setItemsId(itemIdMap.get(sarFileSplitItemsTableEO.getItemsId()).toString()); +// sarFileSplitItemsTableEO.setItemsValId(itemValIdMap.get(sarFileSplitItemsTableEO.getItemsValId()).toString()); +// sarFileSplitItemsTableEO.setCreationTime(new Date()); +// sarFileSplitItemsTableEO.setModifyTime(new Date()); +// sarFileSplitItemsTableEO.setModifyUser(UserUtils.getUserId()); +// } +// if (sarFileSplitItemsTableEOList.size()>0){ +// result += sarFileSplitItemsTableEODao.insertForeach(sarFileSplitItemsTableEOList); +// } + return result; + } + + + public int copyMenuNotChildren(SarFileSplitItemsEO sarFileSplitItemsEO) { + int result =0; + List oldItemIdList = new ArrayList<>(); + Map itemValIdMap = new HashMap<>(); + oldItemIdList.add(sarFileSplitItemsEO.getId()); + + sarFileSplitItemsEO = sarFileSplitItemsEOMapper.selectByPrimaryKey(sarFileSplitItemsEO.getId()); + + // 查询该节点下所有的 子节点 并修改排序 + SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO(); + sarMenuEO.setId(sarFileSplitItemsEO.getMenuId()); + List sarFileSplitMenuEOList = dao.queryAllChildrenByid(sarMenuEO); + sarMenuEO = dao.selectByPrimaryKey(sarMenuEO.getId()); + int maxDisplay = dao.getMaxDisplayByid(sarMenuEO.getId()); + SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); + sarFileSplitMenuEO.setDisplaySeqStart(Long.valueOf(maxDisplay + 1)); + sarFileSplitMenuEO.setDisplaySeqEnd(10000L); + sarFileSplitMenuEO.setChildrenCount(1L); + sarFileSplitMenuEO.setModifyUser(UserUtils.getUserId()); + sarFileSplitMenuEO.setModifyTime(new Date()); + sarFileSplitMenuEO.setInfoId(sarFileSplitItemsEO.getInfoId()); + dao.updateDisplaySeqAdd(sarFileSplitMenuEO); + + // SAR_FILE_ITEMS_MENU 添加数据， + sarMenuEO.setId(UUID.randomUUID().toString().replace("-", "")); + sarMenuEO.setDisplaySeq(Long.valueOf(maxDisplay + 1)); + sarMenuEO.setCreationTime(new Date()); + sarMenuEO.setModifyTime(new Date()); + sarMenuEO.setCreationUser(UserUtils.getUserId()); + sarMenuEO.setModifyUser(UserUtils.getUserId()); + result = dao.insertSelective(sarMenuEO); + + // SAR_FILE_ITEMS 添加数据， + sarFileSplitItemsEO.setId(UUID.randomUUID().toString().replace("-", "")); + sarFileSplitItemsEO.setMenuId(sarMenuEO.getId()); + sarFileSplitItemsEO.setCreationTime(new Date()); + sarFileSplitItemsEO.setModifyTime(new Date()); + sarFileSplitItemsEO.setCreationUser(UserUtils.getUserId()); + sarFileSplitItemsEO.setModifyUser(UserUtils.getUserId()); + result += sarFileSplitItemsEOMapper.insertSelective(sarFileSplitItemsEO); + + // SAR_FILE_ITEMS_VAL 添加数据， + List sarFileSplitItemsValEOList = sarFileSplitItemsValEOMapper.queryItemsValByMenuId(oldItemIdList); + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : sarFileSplitItemsValEOList) { + String newItemValId = UUID.randomUUID().toString().replace("-", ""); + itemValIdMap.put(sarFileSplitItemsValEO.getId(), newItemValId); + sarFileSplitItemsValEO.setId(newItemValId); + sarFileSplitItemsValEO.setItemId(sarFileSplitItemsEO.getId()); + sarFileSplitItemsValEO.setCreationTime(new Date()); + sarFileSplitItemsValEO.setModifyTime(new Date()); + sarFileSplitItemsValEO.setCreationUser(UserUtils.getUserId()); + sarFileSplitItemsValEO.setModifyUser(UserUtils.getUserId()); + } + if (sarFileSplitItemsValEOList.size()>0) { + result += sarFileSplitItemsValEOMapper.insertForeach(sarFileSplitItemsValEOList); + } + // SAR_FILE_ITEMS_PARAMS 添加数据， + List sarFileSplitItemsParamsEOList = sarFileSplitItemsParamsMapper.queryItemsParamsByMenuId(oldItemIdList); + for (SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO : sarFileSplitItemsParamsEOList) { + sarFileSplitItemsParamsEO.setId(UUID.randomUUID().toString().replace("-", "")); + sarFileSplitItemsParamsEO.setItemId(sarFileSplitItemsEO.getId()); + sarFileSplitItemsParamsEO.setCreationTime(new Date()); + sarFileSplitItemsParamsEO.setModifyTime(new Date()); + } + if (sarFileSplitItemsParamsEOList.size()>0){ + result += sarFileSplitItemsParamsMapper.insertForeach(sarFileSplitItemsParamsEOList); + } + // SAR_FILE_ITEMS_TABLE 添加数据， + List sarFileSplitItemsTableEOList = sarFileSplitItemsTableEOMapper.queryItemsTableByMenuId(oldItemIdList); + for (SarFileSplitItemsTableEO sarFileSplitItemsTableEO : sarFileSplitItemsTableEOList) { + sarFileSplitItemsTableEO.setId(UUID.randomUUID().toString().replace("-", "")); + sarFileSplitItemsTableEO.setItemsId(sarFileSplitItemsEO.getId()); + sarFileSplitItemsTableEO.setItemsValId(itemValIdMap.get(sarFileSplitItemsTableEO.getItemsValId()).toString()); + sarFileSplitItemsTableEO.setCreationTime(new Date()); + sarFileSplitItemsTableEO.setModifyTime(new Date()); + sarFileSplitItemsTableEO.setModifyUser(UserUtils.getUserId()); + } + if (sarFileSplitItemsTableEOList.size()>0){ + result += sarFileSplitItemsTableEOMapper.insertForeach(sarFileSplitItemsTableEOList); + } + return result; + } + + public String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO){ + sarFileSplitMenuEO.setId(UUID.randomUUID().toString().replace("-", "")); + sarFileSplitMenuEO.setValidFlag(0); + sarFileSplitMenuEO.setCreationTime(new Date()); + sarFileSplitMenuEO.setModifyTime(new Date()); + int count = dao.insertSelective(sarFileSplitMenuEO); + // 之后的所有节点序号增加 + SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage(); + page.setPId(sarFileSplitMenuEO.getPId()); + List getList = dao.queryByList(page); + if (getList != null && !getList.isEmpty()) { + for(SarFileSplitMenuEO menu : getList){ + Long olgSeq = menu.getDisplaySeq(); + if (olgSeq >= sarFileSplitMenuEO.getDisplaySeq()) { + menu.setDisplaySeq(olgSeq + 1); + dao.updateByPrimaryKeySelective(menu); + } + } + } + return sarFileSplitMenuEO.getId(); + } + + @Override + public int insert(SarFileSplitMenuEO sarFileSplitMenuEO) { + return dao.insert(sarFileSplitMenuEO); + } + + @Override + public int insertSelective(SarFileSplitMenuEO sarFileSplitMenuEO) { + return dao.insertSelective(sarFileSplitMenuEO); + } + + @Override + public int updateByPrimaryKey(SarFileSplitMenuEO sarFileSplitMenuEO) { + return dao.updateByPrimaryKey(sarFileSplitMenuEO); + } + + @Override + public int updateByPrimaryKeySelective(SarFileSplitMenuEO sarFileSplitMenuEO) { + return dao.updateByPrimaryKeySelective(sarFileSplitMenuEO); + } + + @Override + public SarFileSplitMenuEO selectByPrimaryKey(String value) { + return dao.selectByPrimaryKey(value); + } + + @Override + public int deleteByPrimaryKey(String value) { + return dao.deleteByPrimaryKey(value); + } + + @Override + public List queryByList(SarFileSplitMenuEOPage page) { + return dao.queryByList(page); + } + + @Override + public int queryByCount(SarFileSplitMenuEOPage page) { + return dao.queryByCount(page); + } + + @Override + public List queryByPage(SarFileSplitMenuEOPage page) { + return dao.queryByPage(page); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/util/ExcelUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/util/ExcelUtil.java new file mode 100644 index 000000000..22fa83c90 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/util/ExcelUtil.java @@ -0,0 +1,199 @@ +package com.jero.modules.split.util;/** + * Created by Administrator on 2018/12/20 16:42 + */ + +import org.apache.commons.lang.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.multipart.MultipartFile; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; + +import static java.sql.Types.NUMERIC; +import static org.apache.poi.ss.usermodel.DataValidationConstraint.ValidationType.FORMULA; +import static org.apache.xmlbeans.impl.piccolo.xml.Piccolo.STRING; + +/** + * @Author Administrator + * @Description TODO + * Date 2018/12/20 16:42 + * @Param + * @return + **/ +public class ExcelUtil { + + private static final Logger logger = LoggerFactory.getLogger(ExcelUtil.class); + /** + * + * @param filePath 需要读取的文件路径 + * @param column 指定需要获取的列数，例如第一列 1 + * @param startRow 指定从第几行开始读取数据 + * @param endRow 指定结束行 + * @return 返回读取列数据的set + */ + public static List getColumnSet(String fileOrginName, MultipartFile file, int column, int startRow , int endRow) throws IOException { + Workbook wb = readExcel(fileOrginName,file.getInputStream()); //文件 + Sheet sheet = wb.getSheetAt(0); //sheet + int rownum = sheet.getPhysicalNumberOfRows(); //行数 + Row row = null; + List result = new ArrayList<>(); + String cellData = null; + if(wb != null){ + for (int i=startRow-1; i<=endRow; i++){ + System.out.println(i); + row = sheet.getRow(i); + if(row !=null){ + if(row.getCell(column-1)!=null){//单元格为空，不进入 + row.getCell(column-1).setCellType(Cell.CELL_TYPE_STRING);//设置单元格类型 + cellData = row.getCell(column-1).getStringCellValue(); + result.add(cellData); + }else{ + result.add(""); + } + }else{ + + break; + } + System.out.println(cellData); + } + } + return result; + } + + /** + * + * @param filePath 需要读取的文件路径 + * @param column 指定需要获取的列数，例如第一列 1 + * @param startRow 指定从第几行开始读取数据 + * @return 返回读取列数据的set + */ + public static List getColumnSet(String fileOrginName, MultipartFile file, int column, int startRow) throws IOException { + Workbook wb = readExcel(fileOrginName,file.getInputStream()); //文件 + Sheet sheet = wb.getSheetAt(0); //sheet + int rownum = sheet.getPhysicalNumberOfRows(); //行数 + System.out.println("sumrows " + rownum); + + return getColumnSet(fileOrginName,file, column, startRow , rownum-1); + } + + + + //读取excel + public static Workbook readExcel(String fileOrginName,InputStream is){ + Workbook wb = null; + String extString = fileOrginName.substring(fileOrginName.lastIndexOf(".")); + try { + if(".xls".equals(extString)){ + return wb = new HSSFWorkbook(is); + }else if(".xlsx".equals(extString)){ + return wb = new XSSFWorkbook(is); + }else{ + return wb = null; + } + } catch (FileNotFoundException e) { + logger.error("异常：",e); + } catch (IOException e) { + logger.error("异常：",e); + } + return wb; + } + + public static Object getCellFormatValue(Cell cell){ + Object cellValue = null; + if(cell!=null){ + //判断cell类型 + switch(cell.getCellType()){ + case NUMERIC:{ + cell.setCellType(CellType.STRING); //将数值型cell设置为string型 + cellValue = cell.getStringCellValue(); + break; + } + case FORMULA:{ + //判断cell是否为日期格式 + if(DateUtil.isCellDateFormatted(cell)){ + //转换为日期格式YYYY-mm-dd + cellValue = cell.getDateCellValue(); + }else{ + //数字 + cellValue = String.valueOf(cell.getNumericCellValue()); + } + break; + } + case STRING:{ + cellValue = cell.getRichStringCellValue().getString(); + break; + } + default: + cellValue = ""; + } + }else{ + cellValue = ""; + } + return cellValue; + } + + public static String validatePattern(String fileName){ + if(StringUtils.isNotEmpty(fileName)){ + Boolean isOk = false; + if(fileName.lastIndexOf(".docx") != -1){ + isOk = true; + } + if(fileName.lastIndexOf(".pdf") != -1){ + isOk = true; + } + if(fileName.lastIndexOf(".doc") != -1){ + isOk = true; + } + if(fileName.lastIndexOf(".PDF") != -1){ + isOk = true; + } + if(fileName.lastIndexOf(".ppt") != -1){ + isOk = true; + } + if(fileName.lastIndexOf(".pptx") != -1){ + isOk = true; + } + if(isOk){ + //其格式满足条件,无需提示 + return null; + }else { + return "请上传pdf、doc、docx、ppt、pptx文件;"; + } + } + return null; + } + + /** + * 判断对象中属性值是否全为空 + * + * @param object + * @return + */ + public static boolean checkObjAllFieldsIsNull(Object object) { + if (null == object) { + return true; + } + + try { + for (Field f : object.getClass().getDeclaredFields()) { + f.setAccessible(true); + + if (f.get(object) != null && StringUtils.isNotBlank(f.get(object).toString())) { + return false; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + + return true; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java new file mode 100644 index 000000000..d2d3ed7bd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java @@ -0,0 +1,649 @@ +package com.jero.modules.split.util; + +import org.apache.poi.POIXMLDocumentPart; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.hssf.util.HSSFColor; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.*; +import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; + +import java.io.*; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/5/11 10:39 + */ +public class POIReadExcelToHtml { + private static Map map[]; + + /** + * 程序入口方法（将excel文件读取成字符串） + * @param isWithStyle 是否需要表格样式 包含 字体 颜色 边框 对齐方式 + * @return ...
    字符串 + */ + public static String readExcelToHtml(XSSFWorkbook xWb,int sheetNum,boolean isWithStyle){ + String htmlExcel = null; + htmlExcel = readWorkbook(xWb,sheetNum,isWithStyle); + /*try { +// Workbook wb = WorkbookFactory.create(is); + + } catch (Exception e) { + e.printStackTrace(); + }finally{ + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } + }*/ + return htmlExcel; + } + + /** + * 根据excel的版本分配不同的读取方法进行处理 + * @param wb + * @param isWithStyle + * @return + */ + private static String readWorkbook(Workbook wb,int sheetNum,boolean isWithStyle){ + String htmlExcel = ""; + if (wb instanceof XSSFWorkbook) { + XSSFWorkbook xWb = (XSSFWorkbook) wb; + htmlExcel = getExcelInfo(xWb,sheetNum, isWithStyle); + }else if(wb instanceof HSSFWorkbook){ + HSSFWorkbook hWb = (HSSFWorkbook) wb; + htmlExcel = getExcelInfo(hWb,sheetNum, isWithStyle); + } + return htmlExcel; + } + + /** + * 读取excel成string + * @param wb + * @param isWithStyle + * @return + */ + public static String getExcelInfo(Workbook wb,int sheetNum, boolean isWithStyle){ + + StringBuffer sb = new StringBuffer(); + Sheet sheet = wb.getSheetAt(sheetNum);//获取第一个Sheet的内容 + // map等待存储excel图片 +// Map sheetIndexPicMap = getSheetPictrues(0, sheet, wb); + //临时保存位置，正式环境根据部署环境存放其他位置 +// try { +// if(sheetIndexPicMap != null) +// printImg(sheetIndexPicMap); +// } catch (IOException e) { +// e.printStackTrace(); +// } + + //读取excel拼装html + int lastRowNum = sheet.getLastRowNum(); + map = getRowSpanColSpanMap(sheet); + sb.append(""); + Row row = null; //兼容 + Cell cell = null; //兼容 + + for (int rowNum = sheet.getFirstRowNum(); rowNum <= lastRowNum; rowNum ++) { + if(rowNum > 1000) break; + row = sheet.getRow(rowNum); + + int lastColNum = POIReadExcelToHtml.getColsOfTable(sheet)[0]; + int rowHeight = POIReadExcelToHtml.getColsOfTable(sheet)[1]; + + if(null != row) { + lastColNum = row.getLastCellNum(); + rowHeight = row.getHeight(); + } + + if (null == row) { + sb.append(""); + continue; + }else if(row.getZeroHeight()){ + continue; + }else if(0 == rowHeight){ + continue; //针对jxl的隐藏行（此类隐藏行只是把高度设置为0，单getZeroHeight无法识别） + } + sb.append(""); + + for (int colNum = 0; colNum < lastColNum; colNum ++) { + if(sheet.isColumnHidden(colNum)) continue; + String imageRowNum = "0_" + rowNum + "_" + colNum; + String imageHtml = ""; + cell = row.getCell(colNum); + /*if ((sheetIndexPicMap != null && !sheetIndexPicMap.containsKey(imageRowNum) || sheetIndexPicMap == null) && cell == null) { //特殊情况 空白的单元格会返回null+//判断该单元格是否包含图片，为空时也可能包含图片 + sb.append(""); + continue; + } + if(sheetIndexPicMap!=null && sheetIndexPicMap.containsKey(imageRowNum)){ + //待修改路径 + String imagePath = "D:\\pic" + imageRowNum + ".jpeg"; + + imageHtml = ""; + }*/ + String stringValue = getCellValue(cell); + if (map[0].containsKey(rowNum + "," + colNum)) { + String pointString = (String)map[0].get(rowNum + "," + colNum); + int bottomeRow = Integer.valueOf(pointString.split(",")[0]); + int bottomeCol = Integer.valueOf(pointString.split(",")[1]); + int rowSpan = bottomeRow - rowNum + 1; + int colSpan = bottomeCol - colNum + 1; + if(map[2].containsKey(rowNum + "," + colNum)){ + rowSpan = rowSpan - (Integer)map[2].get(rowNum + "," + colNum); + } + sb.append(""); + } + sb.append(""); + continue; + } + sb.append("
    3 && map[3].containsKey(rowNum + "," + colNum)){ + //此类数据首行被隐藏，value为空，需使用其他方式获取值 + stringValue = getMergedRegionValue(sheet, rowNum, colNum); + } + } else if (map[1].containsKey(rowNum + "," + colNum)) { + map[1].remove(rowNum + "," + colNum); + continue; + } else { + sb.append(""); +// if(sheetIndexPicMap!=null && sheetIndexPicMap.containsKey(imageRowNum)) sb.append(imageHtml); + if (stringValue == null || "".equals(stringValue.trim())) { + sb.append(" "); + } else { + // 将ascii码为160的空格转换为html下的空格（ ） + sb.append(stringValue.replace(String.valueOf((char) 160)," ")); + } + sb.append("
    "); + return sb.toString(); + } + + /** + * 分析excel表格，记录合并单元格相关的参数，用于之后html页面元素的合并操作 + * @param sheet + * @return + */ + private static Map[] getRowSpanColSpanMap(Sheet sheet) { + Map map0 = new HashMap(); //保存合并单元格的对应起始和截止单元格 + Map map1 = new HashMap(); //保存被合并的那些单元格 + Map map2 = new HashMap(); //记录被隐藏的单元格个数 + Map map3 = new HashMap(); //记录合并了单元格，但是合并的首行被隐藏的情况 + int mergedNum = sheet.getNumMergedRegions(); + CellRangeAddress range = null; + Row row = null; + for (int i = 0; i < mergedNum; i++) { + range = sheet.getMergedRegion(i); + int topRow = range.getFirstRow(); + int topCol = range.getFirstColumn(); + int bottomRow = range.getLastRow(); + int bottomCol = range.getLastColumn(); + /** + * 此类数据为合并了单元格的数据 + * 1.处理隐藏（只处理行隐藏，列隐藏poi已经处理） + */ + if(topRow != bottomRow){ + int zeroRoleNum = 0; + int tempRow = topRow; + for(int j = topRow; j <= bottomRow; j ++){ + row = sheet.getRow(j); + if(row.getZeroHeight() || row.getHeight() == 0){ + if(j == tempRow){ + //首行就进行隐藏，将rowTop向后移 + tempRow ++; + continue;//由于top下移，后面计算rowSpan时会扣除移走的列，所以不必增加zeroRoleNum; + } + zeroRoleNum ++; + } + } + if(tempRow != topRow){ + map3.put(tempRow + "," + topCol,topRow + "," + topCol); + topRow = tempRow; + } + if(zeroRoleNum!=0) map2.put(topRow + "," + topCol, zeroRoleNum); + } + map0.put(topRow + "," + topCol, bottomRow + "," + bottomCol); + int tempRow = topRow; + while (tempRow <= bottomRow) { + int tempCol = topCol; + while (tempCol <= bottomCol) { + map1.put(tempRow + "," + tempCol, topRow + "," + topCol); + tempCol++; + } + tempRow++; + } + map1.remove(topRow + "," + topCol); + } + Map[] map = { map0, map1 ,map2,map3}; + System.err.println(map0); + return map; + } + + + /** + * 获取合并单元格的值 + * @param sheet + * @param row + * @param column + * @return + */ + public static String getMergedRegionValue(Sheet sheet, int row, int column){ + int sheetMergeCount = sheet.getNumMergedRegions(); + for(int i = 0 ; i < sheetMergeCount ; i++){ + CellRangeAddress ca = sheet.getMergedRegion(i); + int firstColumn = ca.getFirstColumn(); + int lastColumn = ca.getLastColumn(); + int firstRow = ca.getFirstRow(); + int lastRow = ca.getLastRow(); + + if(row >= firstRow && row <= lastRow){ + + if(column >= firstColumn && column <= lastColumn){ + Row fRow = sheet.getRow(firstRow); + Cell fCell = fRow.getCell(firstColumn); + + return getCellValue(fCell) ; + } + } + } + return null ; + } + /** + * 获取表格单元格Cell内容 + * @param cell + * @return + */ + private static String getCellValue(Cell cell) { + String result = new String(); + switch (cell.getCellType()) { + case Cell.CELL_TYPE_NUMERIC:// 数字类型 + if (HSSFDateUtil.isCellDateFormatted(cell)) {// 处理日期格式、时间格式 + SimpleDateFormat sdf = null; + if (cell.getCellStyle().getDataFormat() == HSSFDataFormat.getBuiltinFormat("h:mm")) { + sdf = new SimpleDateFormat("HH:mm"); + } else {// 日期 + sdf = new SimpleDateFormat("yyyy-MM-dd"); + } + Date date = cell.getDateCellValue(); + result = sdf.format(date); + } else if (cell.getCellStyle().getDataFormat() == 58) { + // 处理自定义日期格式：m月d日(通过判断单元格的格式id解决，id的值是58) + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + double value = cell.getNumericCellValue(); + Date date = DateUtil + .getJavaDate(value); + result = sdf.format(date); + } else { + double value = cell.getNumericCellValue(); + CellStyle style = cell.getCellStyle(); + DecimalFormat format = new DecimalFormat(); + String temp = style.getDataFormatString(); + // 单元格设置成常规 + if (temp.equals("General")) { + format.applyPattern("#"); + } + result = format.format(value); + } + break; + case Cell.CELL_TYPE_STRING:// String类型 + result = cell.getRichStringCellValue().toString(); + break; + case Cell.CELL_TYPE_BLANK: + result = ""; + break; + default: + result = ""; + break; + } + return result; + } + + /** + * 处理表格样式 + * @param wb + * @param sheet + * @param cell + * @param sb + */ + private static void dealExcelStyle(Workbook wb, Sheet sheet, Cell cell, StringBuffer sb){ + CellStyle cellStyle = cell.getCellStyle(); + if (cellStyle != null) { + short alignment = cellStyle.getAlignment(); + sb.append("align='" + convertAlignToHtml(alignment) + "' ");//单元格内容的水平对齐方式 + short verticalAlignment = cellStyle.getVerticalAlignment(); + sb.append("valign='"+ convertVerticalAlignToHtml(verticalAlignment)+ "' ");//单元格中内容的垂直排列方式 + + if (wb instanceof XSSFWorkbook) { + + XSSFFont xf = ((XSSFCellStyle) cellStyle).getFont(); + short boldWeight = xf.getBoldweight(); + sb.append("style='"); + sb.append("font-weight:" + boldWeight + ";"); // 字体加粗 + sb.append("font-size: " + xf.getFontHeight() / 2 + "%;"); // 字体大小 + + int topRow = cell.getRowIndex(),topColumn = cell.getColumnIndex(); + if(map[0].containsKey(topRow+","+topColumn)){//该单元格为合并单元格，宽度需要获取所有单元格宽度后合并 + String value = (String)map[0].get(topRow+","+topColumn); + String[] ary = value.split(","); + int bottomColumn = Integer.parseInt(ary[1]); + if(topColumn!=bottomColumn){//合并列，需要计算相应宽度 + int columnWidth = 0; + for(int i=topColumn;i<=bottomColumn;i++){ + columnWidth += sheet.getColumnWidth(i); + } + sb.append("width:" + columnWidth/256*xf.getFontHeight()/20 + "pt;"); + }else{ + int columnWidth = sheet.getColumnWidth(cell.getColumnIndex()) ; + sb.append("width:" + columnWidth/256*xf.getFontHeight()/20 + "pt;"); + } + }else{ + int columnWidth = sheet.getColumnWidth(cell.getColumnIndex()) ; + sb.append("width:" + columnWidth/256*xf.getFontHeight()/20 + "pt;"); + } + + XSSFColor xc = xf.getXSSFColor(); + if (xc != null && !"".equals(xc.toString())) { + sb.append("color:#" + xc.getARGBHex().substring(2) + ";"); // 字体颜色 + } + + XSSFColor bgColor = (XSSFColor) cellStyle.getFillForegroundColorColor(); + if (bgColor != null && !"".equals(bgColor.toString())) { + sb.append("background-color:#" + bgColor.getARGBHex().substring(2) + ";"); // 背景颜色 + } + sb.append("border:solid #000000 1px;"); + // sb.append(getBorderStyle(0,cellStyle.getBorderTop(), ((XSSFCellStyle) cellStyle).getTopBorderXSSFColor())); + // sb.append(getBorderStyle(1,cellStyle.getBorderRight(), ((XSSFCellStyle) cellStyle).getRightBorderXSSFColor())); + // sb.append(getBorderStyle(2,cellStyle.getBorderBottom(), ((XSSFCellStyle) cellStyle).getBottomBorderXSSFColor())); + // sb.append(getBorderStyle(3,cellStyle.getBorderLeft(), ((XSSFCellStyle) cellStyle).getLeftBorderXSSFColor())); + }else if(wb instanceof HSSFWorkbook){ + HSSFFont hf = ((HSSFCellStyle) cellStyle).getFont(wb); + short boldWeight = hf.getBoldweight(); + short fontColor = hf.getColor(); + sb.append("style='"); + + HSSFPalette palette = ((HSSFWorkbook) wb).getCustomPalette(); // 类HSSFPalette用于求的颜色的国际标准形式 + HSSFColor hc = palette.getColor(fontColor); + sb.append("font-weight:" + boldWeight + ";"); // 字体加粗 + sb.append("font-size: " + hf.getFontHeight() / 2 + "%;"); // 字体大小 + String fontColorStr = convertToStardColor(hc); + if (fontColorStr != null && !"".equals(fontColorStr.trim())) { + sb.append("color:" + fontColorStr + ";"); // 字体颜色 + } + + int topRow = cell.getRowIndex(),topColumn = cell.getColumnIndex(); + if(map[0].containsKey(topRow + "," + topColumn)){//该单元格为合并单元格，宽度需要获取所有单元格宽度后合并 + String value = (String)map[0].get(topRow + "," + topColumn); + String[] ary = value.split(","); + int bottomColumn = Integer.parseInt(ary[1]); + if(topColumn != bottomColumn){//合并列，需要计算相应宽度 + int columnWidth = 0; + for(int i = topColumn; i <= bottomColumn; i++){ + columnWidth += sheet.getColumnWidth(i); + } + sb.append("width:" + columnWidth / 256 * hf.getFontHeight() / 20 + "pt;"); + }else{ + int columnWidth = sheet.getColumnWidth(cell.getColumnIndex()) ; + sb.append("width:" + columnWidth / 256 * hf.getFontHeight() / 20 + "pt;"); + } + }else{ + int columnWidth = sheet.getColumnWidth(cell.getColumnIndex()) ; + sb.append("width:" + columnWidth / 256 * hf.getFontHeight() / 20 + "pt;"); + } + + short bgColor = cellStyle.getFillForegroundColor(); + hc = palette.getColor(bgColor); + String bgColorStr = convertToStardColor(hc); + if (bgColorStr != null && !"".equals(bgColorStr.trim())) { + sb.append("background-color:" + bgColorStr + ";"); // 背景颜色 + } + sb.append("border:solid #000000 1px;"); + } + sb.append("' "); + } + } + + /** + * 单元格内容的水平对齐方式 + * @param alignment + * @return + */ + private static String convertAlignToHtml(short alignment) { + String align = "left"; + switch (alignment) { + case CellStyle.ALIGN_LEFT: + align = "left"; + break; + case CellStyle.ALIGN_CENTER: + align = "center"; + break; + case CellStyle.ALIGN_RIGHT: + align = "right"; + break; + default: + break; + } + return align; + } + + /** + * 单元格中内容的垂直排列方式 + * @param verticalAlignment + * @return + */ + private static String convertVerticalAlignToHtml(short verticalAlignment) { + String valign = "middle"; + switch (verticalAlignment) { + case CellStyle.VERTICAL_BOTTOM: + valign = "bottom"; + break; + case CellStyle.VERTICAL_CENTER: + valign = "center"; + break; + case CellStyle.VERTICAL_TOP: + valign = "top"; + break; + default: + break; + } + return valign; + } + + private static String convertToStardColor(HSSFColor hc) { + StringBuffer sb = new StringBuffer(""); + if (hc != null) { + if (HSSFColor.AUTOMATIC.index == hc.getIndex()) { + return null; + } + sb.append("#"); + for (int i = 0; i < hc.getTriplet().length; i ++) { + sb.append(fillWithZero(Integer.toHexString(hc.getTriplet()[i]))); + } + } + return sb.toString(); + } + + private static String fillWithZero(String str) { + if (str != null && str.length() < 2) { + return "0" + str; + } + return str; + } + + static String[] bordesr = {"border-top:", "border-right:", "border-bottom:", "border-left:"}; + static String[] borderStyles = {"solid ", "solid ", "solid ", "solid ", "solid ", "solid ", "solid ", "solid ", "solid ", "solid", "solid", "solid", "solid", "solid"}; + + @SuppressWarnings("unused") + private static String getBorderStyle(HSSFPalette palette , int b, short s, short t){ + if(s == 0) return bordesr[b] + borderStyles[s] + "#d0d7e5 1px;"; + String borderColorStr = convertToStardColor( palette.getColor(t)); + borderColorStr = borderColorStr == null || borderColorStr.length() < 1 ? "#000000" : borderColorStr; + return bordesr[b] + borderStyles[s] + borderColorStr + " 1px;"; + } + + @SuppressWarnings("unused") + private static String getBorderStyle(int b, short s, XSSFColor xc){ + if(s == 0)return bordesr[b] + borderStyles[s] + "#d0d7e5 1px;"; + if (xc != null && ! "".equals(xc)) { + String borderColorStr = xc.getARGBHex();//t.getARGBHex(); + borderColorStr=borderColorStr == null || borderColorStr.length() < 1 ? "#000000" : borderColorStr.substring(2); + return bordesr[b] + borderStyles[s]+borderColorStr+" 1px;"; + } + return ""; + } + + @SuppressWarnings("unused") + private static void writeFile(String content, String path) { + OutputStream os = null; + BufferedWriter bw = null; + try { + File file = new File(path); + os = new FileOutputStream(file); + bw = new BufferedWriter(new OutputStreamWriter(os,"GBK")); + bw.write(content); + } catch (FileNotFoundException fnfe) { + fnfe.printStackTrace(); + } catch (IOException ioe) { + ioe.printStackTrace(); + } finally { + try { + if (null != bw) + bw.close(); + if (null != os) + os.close(); + } catch (IOException ie) { + ie.printStackTrace(); + } + } + } + + + /** + * 获取Excel图片公共方法 + * @param sheetNum 当前sheet编号 + * @param sheet 当前sheet对象 + * @param workbook 工作簿对象 + * @return Map key:图片单元格索引（0_1_1）String，value:图片流PictureData + */ + public static Map getSheetPictrues(int sheetNum, Sheet sheet, Workbook workbook) { + if(workbook instanceof HSSFWorkbook){ + return getSheetPictrues03(sheetNum, (HSSFSheet) sheet, (HSSFWorkbook) workbook); + }else if(workbook instanceof XSSFWorkbook){ + return getSheetPictrues07(sheetNum, (XSSFSheet) sheet, (XSSFWorkbook) workbook); + }else{ + return null; + } + } + + /** + * 获取Excel2003图片 + * @param sheetNum 当前sheet编号 + * @param sheet 当前sheet对象 + * @param workbook 工作簿对象 + * @return Map key:图片单元格索引（0_1_1）String，value:图片流PictureData + * @throws IOException + */ + private static Map getSheetPictrues03(int sheetNum, + HSSFSheet sheet, HSSFWorkbook workbook) { + + Map sheetIndexPicMap = new HashMap(); + List pictures = workbook.getAllPictures(); + if (pictures.size() != 0) { + for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren()) { + HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor(); + shape.getLineWidth(); + if (shape instanceof HSSFPicture) { + HSSFPicture pic = (HSSFPicture) shape; + int pictureIndex = pic.getPictureIndex() - 1; + HSSFPictureData picData = pictures.get(pictureIndex); + String picIndex = String.valueOf(sheetNum) + "_" + + String.valueOf(anchor.getRow1()) + "_" + + String.valueOf(anchor.getCol1()); + sheetIndexPicMap.put(picIndex, picData); + } + } + return sheetIndexPicMap; + } else { + return null; + } + } + + /** + * 获取Excel2007图片 + * @param sheetNum 当前sheet编号 + * @param sheet 当前sheet对象 + * @param workbook 工作簿对象 + * @return Map key:图片单元格索引（0_1_1）String，value:图片流PictureData + */ + private static Map getSheetPictrues07(int sheetNum, + XSSFSheet sheet, XSSFWorkbook workbook) { + Map sheetIndexPicMap = new HashMap(); + + for (POIXMLDocumentPart dr : sheet.getRelations()) { + if (dr instanceof XSSFDrawing) { + XSSFDrawing drawing = (XSSFDrawing) dr; + List shapes = drawing.getShapes(); + for (XSSFShape shape : shapes) { + XSSFPicture pic = (XSSFPicture) shape; + XSSFClientAnchor anchor = pic.getPreferredSize(); + CTMarker ctMarker = anchor.getFrom(); + String picIndex = String.valueOf(sheetNum) + "_" + + ctMarker.getRow() + "_" + ctMarker.getCol(); + sheetIndexPicMap.put(picIndex, pic.getPictureData()); + } + } + } + + return sheetIndexPicMap; + } + + public static void printImg(List> sheetList) throws IOException { + for (Map map : sheetList) { + printImg(map); + } + } + + public static void printImg(Map map) throws IOException { + Object key[] = map.keySet().toArray(); + for (int i = 0; i < map.size(); i++) { + // 获取图片流 + PictureData pic = map.get(key[i]); + // 获取图片索引 + String picName = key[i].toString(); + // 获取图片格式 + String ext = pic.suggestFileExtension(); + + byte[] data = pic.getData(); + + FileOutputStream out = new FileOutputStream("D:\\pic" + picName + "." + ext); + out.write(data); + out.flush(); + out.close(); + } + } + + private static int[] getColsOfTable(Sheet sheet) { + int[] data = {0, 0}; + for (int i = sheet.getFirstRowNum(); i < sheet.getLastRowNum(); i++) { + if (null != sheet.getRow(i)) { + data[0] = sheet.getRow(i).getLastCellNum(); + data[1] = sheet.getRow(i).getHeight(); + } else + continue; + } + return data; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/util/WDWUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/util/WDWUtil.java new file mode 100644 index 000000000..5fc392d05 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/util/WDWUtil.java @@ -0,0 +1,164 @@ +package com.jero.modules.split.util; + +import org.apache.commons.lang3.StringUtils; + +import java.util.regex.Pattern; + +/** + * @des : excel版本判断类 + * @author: duyunbao + * @email: 1114808306@qq.com + * @date 2017/10/27 16:59 + **/ +public class WDWUtil { + + /** + * @method_name: isExcel2003 + * @des :是否是2003的excel，返回true是2003 + * @author: duyunbao + * @param: [filePath] + * @return: boolean + * @date: 2017/10/27 16:57 + **/ + public static boolean isExcel2003(String filePath) { + return filePath.matches("^.+\\.(?i)(xls)$"); + } + + /** + * @method_name: isExcel2007 + * @des : 是否是2007的excel，返回true是2007 + * @author: duyunbao + * @param: [filePath] + * @return: boolean + * @date: 2017/10/27 16:57 + **/ + public static boolean isExcel2007(String filePath) { + return filePath.matches("^.+\\.(?i)(xlsx)$"); + } + + + /** + * 判断字符串是否是整数 + * @MethodName:isInteger + * @author: DuYunbao + * @date: 2018/5/22 18:00 + */ + public static boolean isNumeric(String str){ + for (int i = str.length();--i>=0;){ + if (!Character.isDigit(str.charAt(i))){ + return false; + } + } + return true; + } + + /**方法二：推荐，速度最快 + * 判断是否为整数 + * @param str 传入的字符串 + * @return 是整数返回true,否则返回false + */ + public static boolean isInteger(String str) { + Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$"); + return pattern.matcher(str).matches(); + } + + /** + * 字母或数字 + * + * @MethodName:isLetterDigitOrChinese + * @author: DuYunbao + * @date: 2018/5/30 15:26 + */ + public static boolean isLetterOrNumber(String str) { + String regex = "^(\\d|[a-zA-Z])+$"; + return !str.matches(regex); + } + + /** + * 汉字、字母、（） + * + * @MethodName:isLetterOrChineseOrChar1 + * @author: DuYunbao + * @date: 2018/5/30 15:53 + */ + public static boolean isLetterOrChineseOrChar1(String str) { + String regex = "[^\\a-\\z\\A-\\Z\\u4E00-\\u9FA5\\（）\\()]"; + return str.matches(regex); + } + + /** + * 汉字、字母、数字 + * + * @MethodName:isLetterOrChineseOrNumber + * @author: DuYunbao + * @date: 2018/5/30 15:56 + */ + public static boolean isLetterOrChineseOrNumber(String str) { + String regex = "^[\\u4E00-\\u9FA5A-Za-z0-9]+$"; + return !str.matches(regex); + } + + /** + * 汉字、字母、（）、-、下划线 + * + * @MethodName:isChineseOrLetterOrUnderlineOrChar1 + * @author: DuYunbao + * @date: 2018/5/30 16:03 + */ + public static boolean isChineseOrLetterOrUnderlineOrChar1(String str) { + String regex = "^[\\u4E00-\\u9FA5A-Za-z_\\-\\（）\\()]+$"; + return !str.matches(regex); + } + + /** + * 数字 + * + * @MethodName:isNumbee + * @author: DuYunbao + * @date: 2018/5/30 16:09 + */ + public static boolean isNumber(String str) { + String regex = "\\D"; + return str.matches(regex); + } + + /** + * 数字、大写字母、- + * + * @MethodName:isNumberOrLowerLetterOrChar1 + * @author: DuYunbao + * @date: 2018/5/30 16:41 + */ + public static boolean isNumberOrLowerLetterOrChar1(String str) { + String regex = "^[A-Z0-9\\-]+$"; + return !str.matches(regex); + } + + /** + * 汉字、数字、字母、（）、-、下划线 + * + * @MethodName:isChineseOrNumberOrLetterOrUnderlineOrChar + * @author: DuYunbao + * @date: 2018/5/30 16:45 + */ + public static boolean isChineseOrNumberOrLetterOrUnderlineOrChar(String str) { + String regex = "^[\\u4E00-\\u9FA5A-Za-z0-9_\\-\\（）\\()]+$"; + return !str.matches(regex); + } + + + /** + * 去除整数含有小数点 + * @MethodName:subStr + * @author: DuYunbao + * @date: 2018/5/31 11:19 + */ + public static String subStr(String text) { + if (StringUtils.isNotEmpty(text)) { + if(text.contains(".0") && text.substring(text.length()-2,text.length()).equals(".0")) { + text = text.substring(0,text.length()-2); + } + } + return text; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java index 76bd77087..d54afd7bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java @@ -82,8 +82,8 @@ public class OnlCgformTag implements Serializable { /**表单控件类型*/ - @Excel(name = "表单控件类型", width = 15,dictTable = "onl_cgform_field", dicText = "field_show_type",dicCode ="field_show_type") - @Dict(dictTable = "onl_cgform_field", dicText = "field_show_type",dicCode ="field_show_type") + @Excel(name = "表单控件类型", width = 15,dicCode ="field_show_type") + @Dict(dicCode ="field_show_type") @ApiModelProperty(value = "表单控件类型") private java.lang.String fieldShowType; diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml index b7112cfad..3b58f5f1b 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml @@ -165,6 +165,9 @@ mybatis-plus: id-type: ASSIGN_ID # 默认数据库表下划线命名 table-underline: true + logic-delete-field: delFlag #默认deleted + logic-delete-value: 1 + logic-not-delete-value: 0 configuration: # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application.yml index 36bcb2d39..693099072 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application.yml @@ -4,5 +4,3 @@ spring: profiles: active: @profile.name@ -mybatis-plus: - mapper-locations: classpath:mappers/*.xml \ No newline at end of file diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index 80defc7d6..689513d83 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -41,9 +41,19 @@ that.$store.dispatch('setSidebar', true) } }) - + let langCn = localStorage.language // 默认中文 - localStorage.lang == undefined ? localStorage.setItem('language', 'zh-cn') : '' + if (!langCn) { + localStorage.setItem('language', 'zh-cn') + } else if (langCn == 'en-us') { + this.locale = enUS + moment.locale('en-us') + this.$i18n.locale = EN + } else if (langCn == 'zh-cn') { + this.locale = zhCN + moment.locale('zh-cn') + this.$i18n.locale = ZH + } // 自己配置多语言适配 this.$root.Bus.$on('switchLanguage', value => { let router_path = this.$route.path @@ -95,6 +105,10 @@ height: 100%; } + .doc-detail { + background: #fff + } + .ant-layout { background: transparent !important; } diff --git a/jero-web/src/assets/watermark.js b/jero-web/src/assets/watermark.js index 65874022f..c35e34285 100644 --- a/jero-web/src/assets/watermark.js +++ b/jero-web/src/assets/watermark.js @@ -11,8 +11,14 @@ let setWatermark = (str) => { cans.fillStyle = '#f4f4f4' cans.textAlign = 'left' cans.textBaseline = 'Middle' - cans.fillText(str, 10,120) - document.getElementsByClassName('ant-layout-content')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' + cans.fillText(str, 10, 120) + if (document.getElementsByClassName('ant-layout-content') && document.getElementsByClassName('ant-layout-content').length > 0) { + document.getElementsByClassName('ant-layout-content')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' + + } else { + document.getElementsByClassName('detail-content')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' + + } return id } diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 30d383659..cae396a53 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -320,6 +320,11 @@ export const constantRouterMap = [ name: 'alteration', component: () => import(/* webpackChunkName: "user" */ '@/views/user/alteration/Alteration') }, + { + path: '/docManage/library/detail', + name: 'docIndex', + component: () => import(/* webpackChunkName: "user" */ '@/views/documentManage/library/docDetail/index') + }, ] }, diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index b7aac6aa6..7f6be5bff 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -1,73 +1,86 @@