Merge remote-tracking branch 'origin/master'

# Conflicts:
#	common/src/main/java/com/jpsoft/railroad/modules/base/entity/NetworkNotice.java

common/src/main/java/com/jpsoft/railroad/modules/base/dao/NetworkNoticeDAO.java

@@ -15,4 +15,5 @@ public interface NetworkNoticeDAO {
 	int delete(String id);
 	List<NetworkNotice> list();
 	List<NetworkNotice> search(Map<String, Object> searchParams, List<Sort> sortList);
+	List<NetworkNotice> searchByMobile(Map<String, Object> searchParams, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/railroad/modules/base/entity/NetworkNotice.java

@@ -7,6 +7,8 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.data.annotation.Transient;
+
 import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -56,6 +58,9 @@ public class NetworkNotice {
 			@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
 
+			@Transient
+			private String typeN;
+
 	@Transient
 	@ApiModelProperty(value = "创建人")
 	private String createByN;
@@ -63,5 +68,5 @@ public class NetworkNotice {
 	@Transient
 	@ApiModelProperty(value = "文件列表")
 	private List<Map> urlList;
-	
+
 		}

common/src/main/java/com/jpsoft/railroad/modules/base/service/NetworkNoticeService.java

@@ -14,4 +14,5 @@ public interface NetworkNoticeService {
 	int delete(String id);
 	List<NetworkNotice> list();
 	Page<NetworkNotice> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+	Page<NetworkNotice> pageSearchByMobile(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/railroad/modules/base/service/impl/NetworkNoticeServiceImpl.java

@@ -67,4 +67,13 @@ public class NetworkNoticeServiceImpl implements NetworkNoticeService {
         
         return page;
 	}
+
+	@Override
+	public Page<NetworkNotice> pageSearchByMobile(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+		Page<NetworkNotice> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+			networkNoticeDAO.searchByMobile(searchParams,sortList);
+		});
+
+		return page;
+	}
 }

common/src/main/resources/mapper/base/NetworkNotice.xml

@@ -98,4 +98,29 @@
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchByMobile" parameterType="hashmap" resultMap="NetworkNoticeMap">
+		<![CDATA[
+			select * from base_network_notice a
+		]]>
+		<where>
+			a.del_flag = 0
+			<if test="searchParams.createTime != null">
+				and DATE_FORMAT( a.create_time, '%Y-%m-%d' ) = DATE_FORMAT( #{createTime}, '%Y-%m-%d' )
+			</if>
+			<if test="searchParams.name != null">
+				and a.name_ like #{searchParams.name}
+			</if>
+			<if test="searchParams.businessIds != null">
+				and a.id_ in (select file_id from base_network_notice_ralation
+				where del_flag = 0
+				<foreach item="businessId" collection="searchParams.businessIds"  open="and business_id in (" separator="," close=")">
+					#{businessId}
+				</foreach>
+				)
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 </mapper>

web/src/main/java/com/jpsoft/railroad/modules/mobile/controller/AddressBookApi.java

@@ -82,19 +82,19 @@ public class AddressBookApi {
 
         List<Map> list1 = new ArrayList<>();
 
-        searchParms.put("noName", "测试");
+        searchParms.put("noName", "%测试%");
         Page<Organization> page = organizationService.pageSearch(searchParms,1,10000,false,sortList);
         for(Organization organization : page.getResult()){
-            List<Map> children = children(organization.getId());
+//            List<Map> children = children(organization.getId());
 
             List<RegUser> regUserList = regUserService.findByOrg(organization.getId());
             Map<String,Object> org = new HashMap<>();
             org.put("label",organization.getName());
             org.put("value",organization.getId());
             org.put("userList",regUserList);
-            if(children.size() > 0){
-                org.put("children",children);
-            }
+//            if(children.size() > 0){
+//                org.put("children",children);
+//            }
             list1.add(org);
         }
 

web/src/main/java/com/jpsoft/railroad/modules/mobile/controller/NetworkNoticeApi.java

@@ -0,0 +1,134 @@
+package com.jpsoft.railroad.modules.mobile.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.base.entity.NetworkNotice;
+import com.jpsoft.railroad.modules.base.entity.NetworkNoticeRalation;
+import com.jpsoft.railroad.modules.base.entity.Organization;
+import com.jpsoft.railroad.modules.base.entity.RegUser;
+import com.jpsoft.railroad.modules.base.service.NetworkNoticeRalationService;
+import com.jpsoft.railroad.modules.base.service.NetworkNoticeService;
+import com.jpsoft.railroad.modules.base.service.OrganizationService;
+import com.jpsoft.railroad.modules.base.service.RegUserService;
+import com.jpsoft.railroad.modules.common.dto.MessageResult;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+import com.jpsoft.railroad.modules.common.utils.PojoUtils;
+import com.jpsoft.railroad.modules.sys.service.DataDictionaryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+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.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+@RequestMapping("/mobile/networkNotice")
+@Api(description = "内网公告接口")
+public class NetworkNoticeApi {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Value("${jwt.secret}")
+    private String jwtSecret;
+
+    @Autowired
+    private OrganizationService organizationService;
+    @Autowired
+    private RegUserService regUserService;
+
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+    @Autowired
+    private NetworkNoticeService networkNoticeService;
+    @Autowired
+    private NetworkNoticeRalationService networkNoticeRalationService;
+
+    @ApiOperation(value="公告列表")
+    @RequestMapping(value = "networkNoticeList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "name", required = false,paramType = "form"),
+            @ApiImplicitParam(name = "queryDate", value = "queryDate", required = false,paramType = "form"),
+    })
+    public MessageResult<Map> networkNoticeList(
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date queryDate,
+            @RequestParam(value = "name", defaultValue = "") String name,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+        MessageResult<Map> msgResult = new MessageResult<>();
+        Map<String, Object> map = new HashMap<>();
+
+        try {
+            Map<String,Object> searchParams = new HashMap<>();
+
+            RegUser regUser = regUserService.get(subject);
+            if(regUser == null){
+                throw new Exception("未登录");
+            }
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time","desc"));
+
+            if(queryDate != null){
+                searchParams.put("createTime",queryDate);
+            }
+
+            if(queryDate != null){
+                searchParams.put("name","%" + name + "%");
+            }
+
+            searchParams.put("businessIds",Arrays.asList(regUser.getId(),regUser.getOrgId()));
+            Page<NetworkNotice> page = networkNoticeService.pageSearchByMobile(searchParams,pageIndex,pageSize,true,sortList);
+            for (NetworkNotice networkNotice : page.getResult()){
+                networkNotice.setTypeN(dataDictionaryService.findNameByCatalogNameAndValue("文件类型",networkNotice.getType()));
+            }
+
+            msgResult.setResult(true);
+            msgResult.setData(PojoUtils.pageWrapper(page));
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="公告详细")
+    @RequestMapping(value = "networkNoticeDetails",method = RequestMethod.POST)
+    public MessageResult<Map> networkNoticeDetails(
+            String id,
+            @RequestAttribute String subject){
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        try {
+            Map<String,Object> returnMap = new HashMap<>();
+
+            RegUser regUser = regUserService.get(subject);
+            if(regUser == null){
+                throw new Exception("未登录");
+            }
+
+            NetworkNotice networkNotice = networkNoticeService.get(id);
+            returnMap.put("networkNotice",networkNotice);
+
+            msgResult.setResult(true);
+            msgResult.setData(returnMap);
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+}