字典

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MaidianDictPageDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class MaidianDictPageDTO implements Serializable {
+    private String moduleId;
+
+    private String moduleName;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Integer status;
+
+    private String operationPerson;
+    
+    private List<MaidianDictDTO> pageList;
+
+
+    private static final long serialVersionUID = 1L;
+
+    public List<MaidianDictDTO> getPageList() {
+		return pageList;
+	}
+
+	public void setPageList(List<MaidianDictDTO> pageList) {
+		this.pageList = pageList;
+	}
+
+	public String getModuleId() {
+        return moduleId;
+    }
+
+    public void setModuleId(String moduleId) {
+        this.moduleId = moduleId == null ? null : moduleId.trim();
+    }
+
+    public String getModuleName() {
+        return moduleName;
+    }
+
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName == null ? null : moduleName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getOperationPerson() {
+        return operationPerson;
+    }
+
+    public void setOperationPerson(String operationPerson) {
+        this.operationPerson = operationPerson == null ? null : operationPerson.trim();
+    }
+}
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MaidianDictApiService.java

 package com.gic.haoban.manage.api.service;
 
+import java.util.List;
+
 import com.gic.haoban.manage.api.dto.MaidianDictDTO;
 import com.gic.haoban.manage.api.dto.MaidianDictModuleDTO;
+import com.gic.haoban.manage.api.dto.MaidianDictPageDTO;
 
 /**
  * Created by tgs on 2020/2/9.
@@ -13,5 +16,10 @@ public interface MaidianDictApiService {
 
 	void savePage(MaidianDictDTO dto);
 
+	void delPage(String dictId);
+	
+	void delModule(String moduleId);
 
+	List<MaidianDictPageDTO> dictPage();
+	
 }

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/MaidianDictController.java

+package com.gic.haoban.manage.web.controller;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.csp.sentinel.util.StringUtil;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.MaidianDictDTO;
+import com.gic.haoban.manage.api.dto.MaidianDictModuleDTO;
+import com.gic.haoban.manage.api.dto.MaidianDictPageDTO;
+import com.gic.haoban.manage.api.service.MaidianDictApiService;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+
+
+
+@RequestMapping("/maidian")
+@RestController
+public class MaidianDictController extends WebBaseController{
+    private static final String LOGIN_URL = "/haoban-manage3-web/yw-login";
+	private static Logger logger  = LoggerFactory.getLogger(MaidianDictController.class);
+
+	@Autowired
+	private MaidianDictApiService maidianDictApiService;
+	//保存模块
+	@RequestMapping("save-module")
+	public HaobanResponse saveModule(MaidianDictModuleDTO dto) {
+		maidianDictApiService.saveModule(dto);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+	//保存字典
+	@RequestMapping("save-page")
+	public HaobanResponse savePage(MaidianDictDTO dto) {
+		if(StringUtil.isEmpty(dto.getModuleId())){
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+		maidianDictApiService.savePage(dto);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+	//删除模块
+	@RequestMapping("del-module")
+	public HaobanResponse delModule(String  moduleId) {
+		maidianDictApiService.delModule(moduleId);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+	//删除字典
+	@RequestMapping("del-page")
+	public HaobanResponse delPage(String  dictId) {
+		maidianDictApiService.delPage(dictId);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+	
+	//字典页面
+	@RequestMapping("dict-page")
+	public HaobanResponse dictPage( ) {
+		List<MaidianDictPageDTO> result = maidianDictApiService.dictPage();
+		return resultResponse(HaoBanErrCode.ERR_1,result);
+	}
+}

haoban-manage3-operation-web/src/main/webapp/WEB-INF/dubbo-haoban-manage3-operation-web.xml

@@ -32,8 +32,6 @@
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService" id="staffDepartmentRelatedApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.DictApiService" id="dictApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.HelpApiService" id="helpApiService"/>
-	
-	
-	
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.MaidianDictApiService" id="maidianDictApiService"/>
 	
 </beans>

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanMaidianDictMapper.java

 package com.gic.haoban.manage.service.dao.mapper;
 
+import java.util.List;
+
 import com.gic.haoban.manage.service.entity.TabHaobanMaidianDict;
 
 public interface TabHaobanMaidianDictMapper {
@@ -14,4 +16,6 @@ public interface TabHaobanMaidianDictMapper {
     int updateByPrimaryKeySelective(TabHaobanMaidianDict record);
 
     int updateByPrimaryKey(TabHaobanMaidianDict record);
+    
+    List<TabHaobanMaidianDict> listByModuleId(String moduleId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanMaidianDictModuleMapper.java

 package com.gic.haoban.manage.service.dao.mapper;
 
+import java.util.List;
+
 import com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule;
 
 public interface TabHaobanMaidianDictModuleMapper {
@@ -14,4 +16,6 @@ public interface TabHaobanMaidianDictModuleMapper {
     int updateByPrimaryKeySelective(TabHaobanMaidianDictModule record);
 
     int updateByPrimaryKey(TabHaobanMaidianDictModule record);
+    
+    List<TabHaobanMaidianDictModule> list();
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MaidianDictApiServiceImpl.java

@@ -3,17 +3,22 @@ package com.gic.haoban.manage.service.service.out.impl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import cn.hutool.core.collection.CollectionUtil;
+
 import com.alibaba.csp.sentinel.util.StringUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.MaidianDictDTO;
 import com.gic.haoban.manage.api.dto.MaidianDictModuleDTO;
+import com.gic.haoban.manage.api.dto.MaidianDictPageDTO;
 import com.gic.haoban.manage.api.service.MaidianDictApiService;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanMaidianDictMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanMaidianDictModuleMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanMaidianDict;
 import com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule;
+
 import java.util.Date;
+import java.util.List;
 
 /**
  * Created by tgs on 2020/2/9.
@@ -57,5 +62,28 @@ public class MaidianDictApiServiceImpl implements MaidianDictApiService{
 		}
 		
 	}
+	@Override
+	public void delPage(String dictId) {
+		tabHaobanMaidianDictMapper.deleteByPrimaryKey(dictId);
+	}
+	@Override
+	public void delModule(String moduleId) {
+		tabHaobanMaidianDictModuleMapper.deleteByPrimaryKey(moduleId);		
+	}
+	@Override
+	public List<MaidianDictPageDTO> dictPage() {
+		List<TabHaobanMaidianDictModule> list = tabHaobanMaidianDictModuleMapper.list();
+		List<MaidianDictPageDTO> result = EntityUtil.changeEntityListByJSON(MaidianDictPageDTO.class, list);
+		if(CollectionUtil.isEmpty(result)){
+			return result;
+		}
+		for(MaidianDictPageDTO dto :result){
+			String moduleId = dto.getModuleId();
+			List<TabHaobanMaidianDict> dictList = tabHaobanMaidianDictMapper.listByModuleId(moduleId);
+			List<MaidianDictDTO> subList = EntityUtil.changeEntityListByJSON(MaidianDictDTO.class, dictList);
+			dto.setPageList(subList);
+		}
+		return result;
+	}
 
 }

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -39,7 +39,7 @@
          <dubbo:service interface="com.gic.haoban.manage.api.service.AuditApiService" ref="auditApiServiceImpl" timeout="10000"/>
          <dubbo:service interface="com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService" ref="clerkMainStoreRelatedApiServiceImpl" timeout="10000"/>
          <dubbo:service interface="com.gic.haoban.manage.api.service.MaidianLogApiService" ref="maidianLogApiServiceImpl" timeout="10000"/>
-         
+         <dubbo:service interface="com.gic.haoban.manage.api.service.MaidianDictApiService" ref="maidianDictApiServiceImpl" timeout="10000"/>
          <dubbo:service interface="com.gic.haoban.manage.api.service.MaterialApiService" ref="materialApiServiceImpl" timeout="10000"/>
 
     <dubbo:service interface="com.gic.haoban.manage.api.service.DealSyncOperationApiService"

haoban-manage3-service/src/main/resources/mapper/TabHaobanMaidianDictMapper.xml

@@ -174,4 +174,14 @@
       code = #{code,jdbcType=VARCHAR}
     where dict_id = #{dictId,jdbcType=VARCHAR}
   </update>
+  
+    <select id="listByModuleId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_maidian_dict
+    where module_id = #{moduleId,jdbcType=VARCHAR}
+    	and status = 1
+    	order by create_time
+  </select>
+  
 </mapper>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/TabHaobanMaidianDictModuleMapper.xml

@@ -103,4 +103,13 @@
       operation_person = #{operationPerson,jdbcType=VARCHAR}
     where module_id = #{moduleId,jdbcType=VARCHAR}
   </update>
+  
+    <select id="list" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_maidian_dict_module
+    where status =1 
+    order by create_time 
+  </select>
+  
 </mapper>
\ No newline at end of file