接口api

dgtly-admin/src/main/resources/static/css/login.css

@@ -13,12 +13,24 @@ body.signin {
 	background-size:cover;
 	color:rgba(255,255,255,.95)
 }
+
+.btn-new {
+	background-color:#fd5522;
+	border-color: #fd5522;
+}
+.btn-new:hover{
+	background-color: #fd5522;
+	border-color: #fd5522;
+	color: #FFFFFF;
+}
+
+
 .signinTop{
-	height:8%;
+	height:10%;
 	background-color: white;
 	font-weight: bold;
-	font-size: 2.4rem;
-	color: #3e92bb;
+	font-size: 2.0rem;
+	color: #fd5522;
 	top: 0px;
 	width: 100%;
 	position: absolute;
@@ -69,7 +81,8 @@ body.signin {
 	margin-top:15px
 }
 .signinpanel form {
-	background:rgba(255,255,255,.2);
+	/**background:rgba(255,255,255,.2);**/
+	background-color: white;
 	border:1px solid rgba(255,255,255,.3);
 	-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);
 	-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);
@@ -167,6 +180,7 @@ body.signin {
     color: #333;
 }
 .checkbox-custom label {
+	color: black;
     cursor: pointer;
     line-height: 1.2;
     font-weight: normal; /*改变了rememberme的字体*/

dgtly-admin/src/main/resources/templates/login.html

@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
     
-    <title>通誉企业云平台</title>
-    <meta name="description" content="通誉企业云平台">
+    <title>中国钢制家具产业聚集网</title>
+    <meta name="description" content="中国钢制家具产业聚集网">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>
@@ -15,7 +15,9 @@
     <meta http-equiv="refresh" content="0;ie.html" />
     <![endif]-->
     <link rel="shortcut icon" href="../static/favicon_back.ico" th:href="@{favicon.ico}"/>
-    <style type="text/css">label.error { position:inherit;  }</style>
+    <style type="text/css">label.error { position:inherit;  }
+
+    </style>
     <script>
         if(window.top!==window.self){window.top.location=window.location};
     </script>
@@ -25,7 +27,7 @@
     <div class="signinTop">
         <div >
             <img th:src="@{/favicon.ico}">
-                iSmartFace人工智能应用平台
+            中国钢制家具产业聚集网
         </div>
     </div>
     <div class="signinpanel">
@@ -42,7 +44,7 @@
             </div>-->
             <div class="col-md-3 col-md-offset-8">
                 <form id="signupForm">
-                    <h4 class="no-margins">登录：</h4>
+                    <h4 class="no-margins" style="color: black">欢迎登录：</h4>
                     <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value=""    />
                     <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="" />
 					<div class="row m-t" th:if="${captchaEnabled==true}">
@@ -58,7 +60,7 @@
                     <div class="checkbox-custom" th:classappend="${captchaEnabled==false} ? 'm-t'">
 				        <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
 				    </div>
-                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button>
+                    <button class="btn btn-success btn-block btn-new" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button>
                 </form>
             </div>
         </div>

dgtly-member/dgtly-member-admin/src/main/java/com/dgtly/notice/controller/NoticeSupplyController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.dgtly.common.annotation.DataScope;
 import com.dgtly.common.utils.StringUtils;
 import com.dgtly.common.utils.file.FileUploadUtils;
+import com.dgtly.framework.util.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -100,6 +101,9 @@ public class NoticeSupplyController extends BaseController
             //base64转文件 并返回展示url
             String fileUrl = FileUploadUtils.base64ToFile(base64,FileUploadUtils.getDefaultBaseDir()+"/content",System.currentTimeMillis()+"."+houzhui);
             noticeSupply.setPicture(fileUrl);
+            noticeSupply.setMerchantId(ShiroUtils.getCompanyId());
+            noticeSupply.setCreateBy(ShiroUtils.getLoginName());
+
         }
         return toAjax(noticeSupplyService.insertNoticeSupply(noticeSupply));
     }

dgtly-member/dgtly-member-admin/src/main/resources/templates/notice/supply/add.html

@@ -9,13 +9,17 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-supply-add">
-
             <div class="form-group">
-                <div class="col-sm-6">
+                <label class="col-sm-3 control-label"><span style="color: red; ">*</span>供应信息标题：</label>
+                <div class="col-sm-8">
+                    <input name="supplyTitle" class="form-control" type="text" required>
+                </div>
+            </div>
+
                     <div class="form-group">
                         <input name="typeId" type="hidden" id="input_typeId">
-                        <label class="col-sm-3 control-label"><span style="color: red; ">*</span>所属分类：</label>
-                        <div class="col-sm-10">
+                        <label class="col-sm-3 control-label"><span style="color: red; ">*</span>商品分类：</label>
+                        <div class="col-sm-8">
                             <div class="input-group">
                                 <input name="typeName" onclick="selectTypeTree()" id="input_typeTreeName" type="text" placeholder="请选择所属分类" class="form-control"
                                        readonly="readonly" required>
@@ -23,26 +27,9 @@
                             </div>
                         </div>
                     </div>
-                </div>
-            </div>
-<!--            <div class="form-group">    -->
-<!--                <label class="col-sm-3 control-label">关联商品类别表id：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="typeId" class="form-control" type="text" required>-->
-<!--                </div>-->
-<!--            </div>-->
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">商户名称</label>
-                <div class="col-sm-8">
-                    <input name="merchantId" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">供应信息标题：</label>
-                <div class="col-sm-8">
-                    <input name="supplyTitle" class="form-control" type="text" required>
-                </div>
-            </div>
+
+
+
             <div class="row">
                 <div class="form-group">
                     <label class="col-sm-3 control-label"><span style="color: red; ">*</span>供应信息详情：</label>
@@ -53,37 +40,37 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">生产厂家：</label>
+                <label class="col-sm-3 control-label"><span style="color: red; ">*</span>生产厂家：</label>
                 <div class="col-sm-8">
                     <input name="manufacturer" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">联系人：</label>
+                <label class="col-sm-3 control-label"><span style="color: red; ">*</span>联系人：</label>
                 <div class="col-sm-8">
                     <input name="contacts" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">联系电话：</label>
+                <label class="col-sm-3 control-label"><span style="color: red; ">*</span>联系电话：</label>
                 <div class="col-sm-8">
                     <input name="telephone" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">发布时间：</label>
+                <label class="col-sm-3 control-label"><span style="color: red; ">*</span>发布时间：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="releaseTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input name="releaseTime" class="form-control"  type="text">
                     </div>
                 </div>
             </div>
-            <div class="row">
+
                 <div class="form-group">
                     <input id="fmzFile" name="picture" type="hidden"/>
-                    <label class="col-sm-2 control-label"><span style="color: red; ">*</span>商品图片：</label>
-                    <div class="col-sm-10">
+                    <label class="col-sm-3 control-label"><span style="color: red; ">*</span>商品图片：</label>
+                    <div class="col-sm-8">
                         <div class="fileinput fileinput-new" data-provides="fileinput">
                             <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;">
                                 <img th:src="@{/img/profile.jpg}">
@@ -98,7 +85,7 @@
                         </div>
                     </div>
                 </div>
-            </div>
+
             <div class="form-group">    
                 <label class="col-sm-3 control-label">供应信息状态：</label>
                 <div class="col-sm-8">

dgtly-member/dgtly-member-admin/src/main/resources/templates/notice/supply/supply.html

@@ -19,7 +19,7 @@
 <!--                                <input type="text" name="merchantId"/>-->
 <!--                            </li>-->
                             <li>
-                                <p>供应信息标题：</p>
+                                <p>供应标题：</p>
                                 <input type="text" name="supplyTitle"/>
                             </li>
                             <li>
@@ -41,7 +41,7 @@
                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endReleaseTime]"/>
                             </li>
                             <li>
-                                <p>供应信息状态：</p>
+                                <p>供应状态：</p>
                                 <select name="status">
                                     <option value="">所有</option>
                                     <option value="0">征集中</option>
@@ -58,16 +58,16 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:supply:add">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="notice:supply:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:supply:edit">
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="notice:supply:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:supply:remove">
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="notice:supply:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:supply:export">
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="notice:supply:export">
                     <i class="fa fa-download"></i> 导出
                  </a>
             </div>
@@ -79,9 +79,9 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var conductStatus = [[${@dict.getType('conduct_status')}]];
-        var editFlag = [[${@permission.hasPermi('system:supply:edit')}]];
-        var detailFlag = [[${@permission.hasPermi('monitor:operlog:detail')}]];
-        var removeFlag = [[${@permission.hasPermi('system:supply:remove')}]];
+        var editFlag = [[${@permission.hasPermi('notice:supply:edit')}]];
+        //var detailFlag = [[${@permission.hasPermi('monitor:operlog:detail')}]];
+        var removeFlag = [[${@permission.hasPermi('notice:supply:remove')}]];
         var prefix = ctx + "notice/supply";
 
         $(function() {
@@ -111,12 +111,12 @@
                 // },
                 {
                     field : 'supplyTitle', 
-                    title : '供应信息标题'
+                    title : '供应标题'
                 },
-                    {
+                   /* {
                         field : 'supplyDetails',
                         title : '供应信息详情'
-                    },
+                    },*/
                 {
                     field : 'manufacturer', 
                     title : '生产厂家'
@@ -131,30 +131,33 @@
                 },
                 {
                     field : 'releaseTime', 
-                    title : '发布时间'
+                    title : '发布时间',
+                    formatter: function(value, row, index) {
+                        return value.split(' ')[0];
+                    }
                 },
-                {
-                    field : 'picture', 
+               /* {
+                    field : 'picture',
                     title : '商品图片'
-                },
+                },*/
                 {
                     field : 'status', 
-                    title : '供应信息状态',
+                    title : '供应状态',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(conductStatus, value);
                     }
                 },
-                {
-                    field : 'remark', 
+              /*  {
+                    field : 'remark',
                     title : '备注'
-                },
+                },*/
                 {
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改状态</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改</a> ');
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
@@ -162,6 +165,8 @@
             };
             $.table.init(options);
         });
+
+
     </script>
 </body>
 </html>

dgtly-member/dgtly-member-api/src/main/java/com/dgtly/member/controller/SupplyInfoController.java

@@ -44,7 +44,7 @@ public class SupplyInfoController extends ApiBaseController {
         ParameterObject obj =  getParameterObject();
         NoticeSupply noticeSupply = obj.parseBean(NoticeSupply.class);
         startPage(obj);/*向分页传递 分页参数*/
-        List<NoticeSupply> noticeSupplyList = iNoticeSupplyService.selectNoticeSupplyList(noticeSupply);
+        List<NoticeSupply> noticeSupplyList = iNoticeSupplyService.getSupplyInfoAllList(noticeSupply);
         return AjaxResult.success(getDataTable(noticeSupplyList));
     }
 

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/notice/mapper/NoticeSupplyMapper.java

@@ -67,4 +67,14 @@ public interface NoticeSupplyMapper
      * @date: 2020-2-25 11:15
      */
     public List<NoticeSupply> getSupplyInfoTenList();
+
+    /**
+     * @descption: 网站获取供应信息列表
+     * @param:
+     * @return:
+     * @auther: LiuLingChao
+     * @date: 2020-3-3 9:15
+     */
+
+    public List<NoticeSupply> getSupplyInfoAllList(NoticeSupply noticeSupply);
 }

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/notice/service/INoticeSupplyService.java

@@ -67,4 +67,15 @@ public interface INoticeSupplyService
      * @date: 2020-2-25 11:13
      */
     public List<NoticeSupply> getSupplyInfoTenList();
+
+
+
+    /**
+     * @descption: 网站获取供应信息列表
+     * @param:
+     * @return:
+     * @auther: LiuLingChao
+     * @date: 2020-3-3 9:14
+     */
+    public  List<NoticeSupply> getSupplyInfoAllList(NoticeSupply noticeSupply);
 }

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/notice/service/impl/NoticeSupplyServiceImpl.java

@@ -102,4 +102,10 @@ public class NoticeSupplyServiceImpl implements INoticeSupplyService
     public List<NoticeSupply> getSupplyInfoTenList() {
         return noticeSupplyMapper.getSupplyInfoTenList();
     }
+
+
+    @Override
+    public List<NoticeSupply> getSupplyInfoAllList(NoticeSupply noticeSupply) {
+        return noticeSupplyMapper.getSupplyInfoAllList(noticeSupply);
+    }
 }

dgtly-member/dgtly-member-common/src/main/resources/mapper/notice/NoticeSupplyMapper.xml

@@ -155,5 +155,37 @@ FROM
         order by release_time desc limit 0,10
 
     </select>
+
+    <select id="getSupplyInfoAllList" parameterType="NoticeSupply" resultMap="NoticeSupplyResult">
+        SELECT
+          n.id,
+          n.type_id,
+          t.name,
+          n.merchant_id,
+          n.supply_title,
+          n.supply_details,
+          n.manufacturer,
+          n.contacts,
+          n.telephone,
+          n.release_time,
+          n.picture,
+          n.status,
+          n.create_by,
+          n.create_time
+        FROM
+          notice_supply AS n
+          LEFT JOIN goods_type AS t ON n.`type_id` = t.`id`
+        <where>
+            <if test="typeId != null "> and n.type_id = #{typeId}</if>
+            <if test="merchantId != null "> and n.merchant_id = #{merchantId}</if>
+            <if test="supplyTitle != null  and supplyTitle != ''"> and n.supply_title = #{supplyTitle}</if>
+            <if test="manufacturer != null  and manufacturer != ''"> and n.manufacturer = #{manufacturer}</if>
+            <if test="contacts != null  and contacts != ''"> and n.contacts = #{contacts}</if>
+            <if test="telephone != null  and telephone != ''"> and n.telephone = #{telephone}</if>
+            <if test="status != null  and status != ''"> and n.status = #{status}</if>
+        </where>
+        order by  n.create_time desc
+    </select>
+
     
 </mapper>